From 01f207d979d6be17c8cdec293feab48828c0ec3e Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期五, 08 四月 2022 14:22:52 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/classes/SetPersonalTargetController.cls | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/force-app/main/default/classes/SetPersonalTargetController.cls b/force-app/main/default/classes/SetPersonalTargetController.cls
index b5dc5f2..476e32d 100644
--- a/force-app/main/default/classes/SetPersonalTargetController.cls
+++ b/force-app/main/default/classes/SetPersonalTargetController.cls
@@ -769,6 +769,17 @@
for (Position p : plist) {
if (p.check) {
positionNames.add(p.positionName);
+ //20220406 lt SWAG-CD28H3 銆愬鎵樸�戙�愭湡鍒濅慨鏀�4鏈�6鏃ュ紑濮嬩慨鏀广�戠洰鏍囧綍鍏ョ浉鍏冲垽鏂慨鏀� start
+ if(p.positionName == '缁忕悊绾�'){
+ positionNames.add('鍓粡鐞�');
+ positionNames.add('缁忕悊');
+ }
+ if(p.positionName == '鎬荤洃绾�'){
+ positionNames.add('鍓儴闀�');
+ positionNames.add('閮ㄩ暱');
+ positionNames.add('鎬荤洃');
+ }
+ //20220406 lt SWAG-CD28H3 銆愬鎵樸�戙�愭湡鍒濅慨鏀�4鏈�6鏃ュ紑濮嬩慨鏀广�戠洰鏍囧綍鍏ョ浉鍏冲垽鏂慨鏀筫nd
}
}
if (positionNames.size() > 0) {
@@ -777,24 +788,8 @@
for (Integer i = 0; i < positionNames.size(); i++) {
if (i == positionNames.size() - 1) {
soql += ' Post__c = \'' + positionNames[i] + '\'';
- //20220402 lt SWAG-CD28H3 銆愬鎵樸�戙�愭湡鍒濅慨鏀�4鏈�6鏃ュ紑濮嬩慨鏀广�戠洰鏍囧綍鍏ョ浉鍏冲垽鏂慨鏀� start
- if(positionNames[i] == '缁忕悊绾�'){
- soql += ' or Post__c = \'鍓粡鐞哱' or Post__c = \'缁忕悊\'';
- }
- if(positionNames[i] == '鎬荤洃绾�'){
- soql += ' or Post__c = \'鍓儴闀縗' or Post__c = \'閮ㄩ暱\' or Post__c = \'鎬荤洃\'';
- }
- //20220402 lt SWAG-CD28H3 銆愬鎵樸�戙�愭湡鍒濅慨鏀�4鏈�6鏃ュ紑濮嬩慨鏀广�戠洰鏍囧綍鍏ョ浉鍏冲垽鏂慨鏀� end
} else {
soql += ' Post__c = \'' + positionNames[i] + '\' or';
- //20220402 lt SWAG-CD28H3 銆愬鎵樸�戙�愭湡鍒濅慨鏀�4鏈�6鏃ュ紑濮嬩慨鏀广�戠洰鏍囧綍鍏ョ浉鍏冲垽鏂慨鏀� start
- if(positionNames[i] == '缁忕悊绾�'){
- soql += ' Post__c = \'鍓粡鐞哱' or Post__c = \'缁忕悊\' or ';
- }
- if(positionNames[i] == '鎬荤洃绾�'){
- soql += ' Post__c = \'鍓儴闀縗' or Post__c = \'閮ㄩ暱\' or Post__c = \'鎬荤洃\'';
- }
- //20220402 lt SWAG-CD28H3 銆愬鎵樸�戙�愭湡鍒濅慨鏀�4鏈�6鏃ュ紑濮嬩慨鏀广�戠洰鏍囧綍鍏ョ浉鍏冲垽鏂慨鏀� end
}
}
soql += ')';
--
Gitblit v1.9.1