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 | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/classes/SetPersonalTargetController.cls b/force-app/main/default/classes/SetPersonalTargetController.cls
index a267071..476e32d 100644
--- a/force-app/main/default/classes/SetPersonalTargetController.cls
+++ b/force-app/main/default/classes/SetPersonalTargetController.cls
@@ -231,10 +231,14 @@
plist.add(new Position('涓�鑸�', true));
plist.add(new Position('楂樼骇', true));
plist.add(new Position('涓荤', true));
- plist.add(new Position('鍓粡鐞�', true));
- plist.add(new Position('缁忕悊', false));
- plist.add(new Position('鍓儴闀�', false));
- plist.add(new Position('閮ㄩ暱', false));
+ //20220402 lt SWAG-CD28H3 銆愬鎵樸�戙�愭湡鍒濅慨鏀�4鏈�6鏃ュ紑濮嬩慨鏀广�戠洰鏍囧綍鍏ョ浉鍏冲垽鏂慨鏀� start
+ // plist.add(new Position('鍓粡鐞�', true));
+ // plist.add(new Position('缁忕悊', false));
+ // plist.add(new Position('鍓儴闀�', false));
+ // plist.add(new Position('閮ㄩ暱', false));
+ plist.add(new Position('缁忕悊绾�', true));
+ plist.add(new Position('鎬荤洃绾�', false));
+ //20220402 lt SWAG-CD28H3 銆愬鎵樸�戙�愭湡鍒濅慨鏀�4鏈�6鏃ュ紑濮嬩慨鏀广�戠洰鏍囧綍鍏ョ浉鍏冲垽鏂慨鏀� start
}
// 褰撳墠鐢ㄦ埛淇℃伅
@@ -765,9 +769,21 @@
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) {
+
soql += ' and (';
for (Integer i = 0; i < positionNames.size(); i++) {
if (i == positionNames.size() - 1) {
@@ -779,7 +795,7 @@
soql += ')';
}
soql += ' order by Salesdepartment__c, Province__c, UserRole.Name';
- System.debug('**********'+soql);
+ System.debug('**********123'+soql);
return Database.query(soql);
}
--
Gitblit v1.9.1