Pārlūkot izejas kodu

fix ops scope and pageDirectCheck

dengjia 4 mēneši atpakaļ
vecāks
revīzija
028eaf1162

+ 2 - 2
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmPackageManager.java

@@ -1281,11 +1281,11 @@ public class WmPackageManager {
                         model.setNode9RejectNum(Integer.toString(rejected[9]));
                         model.setNode9TodoNum(Integer.toString(todos[9]));
                       }
-                      if(scope.operatorRoleIds.contains(41) || scope.operatorRoleIds.contains(39)) { // 分管领导 & 总经理
+                      if(scope.operatorRoleIds.contains(41) || scope.operatorRoleIds.contains(39) || scope.operatorRoleIds.contains(3)) { // 分管领导 & 总经理 & 运营
                         model.setNode5PassedNum(Integer.toString(passed[5]));
                         model.setNode5RejectNum(Integer.toString(rejected[5]));
                         model.setNode5TodoNum(Integer.toString(todos[5]));
-                        if(scope.operatorRoleIds.contains(39)) { // 总经理
+                        if(scope.operatorRoleIds.contains(39) || scope.operatorRoleIds.contains(3)) { // 总经理 & 运营
                           model.setNode6PassedNum(Integer.toString(passed[6]));
                           model.setNode6RejectNum(Integer.toString(rejected[6]));
                           model.setNode6TodoNum(Integer.toString(todos[6]));

+ 1 - 0
hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmTaskV2Mapper.xml

@@ -52,6 +52,7 @@
     <foreach collection="nodeIds" item="nodeId" open="(" close=")" separator=",">
       #{nodeId}
     </foreach>
+    AND t.del_flag = '0'
     ORDER BY task_id) AS his
     ON his.task_id = t.id
     <where>