删除固定流程查看权限

jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/web/ActBusinessController.java

@@ -692,20 +692,22 @@ public class ActBusinessController {
 
         Map<String,Object> map=new HashMap<>();
         map.put("userId",loginUser.getUsername());//当前登陆人
+
+
         if(loginUser.getUsername().equals("admin")){
             map.put("userId",null);//当前登陆人
         }
-        if(param.getTableName().equals("incident_ticket")){ //质量事故单
-            map.put("userId",null);//当前登陆人
-        }
-
-        if(loginUser.getUsername().equals("T0003")){
-            if(param.getTableName().equals("supplieses_apply_a") || //物质申请单
-                    param.getTableName().equals("employee_leave") ||//员工请假单
-                    param.getTableName().equals("expense_account")){//报销单
-                map.put("userId",null);//当前登陆人
-            }
-        }
+//        if(param.getTableName().equals("incident_ticket")){ //质量事故单
+//            map.put("userId",null);//当前登陆人
+//        }
+//
+//        if(loginUser.getUsername().equals("T0003")){
+//            if(param.getTableName().equals("supplieses_apply_a") || //物质申请单
+//                    param.getTableName().equals("employee_leave") ||//员工请假单
+//                    param.getTableName().equals("expense_account")){//报销单
+//                map.put("userId",null);//当前登陆人
+//            }
+//        }
 
 //        if(param.getTableName().equals("employee_leave")){ //员工请假单
 //            String userIds = sysBaseAPI.getUserByRoleCode("SY003",null);//办公室
@@ -723,23 +725,30 @@ public class ActBusinessController {
 //                }
 //            }
 //        }
-        if(param.getTableName().equals("expense_account")){ //报销单
-            String userIds = sysBaseAPI.getUserByRoleCode("SY013",null);//财务出纳
-            if(StringUtils.isNotBlank(userIds)){
-                if(userIds.contains(loginUser.getUsername())){
-                    map.put("userId",null);//当前登陆人
-                }
-            }
-        }
+//        if(param.getTableName().equals("expense_account")){ //报销单
+//            String userIds = sysBaseAPI.getUserByRoleCode("SY013",null);//财务出纳
+//            if(StringUtils.isNotBlank(userIds)){
+//                if(userIds.contains(loginUser.getUsername())){
+//                    map.put("userId",null);//当前登陆人
+//                }
+//            }
+//        }
+//
+//        String userIds = "";
+//        if(param.getTableName().equals("seal_apply")){ //用印申请
+//            userIds = sysBaseAPI.getUserByRoleCode("SY002", null);//财务经理
+//        }else{
+//            userIds = sysBaseAPI.getUserByRoleCode("SY003", null);//办公室
+//        }
+//        if(StringUtils.isNotBlank(userIds)){
+//            if(userIds.contains(loginUser.getUsername())){
+//                map.put("userId",null);//当前登陆人
+//            }
+//        }
 
-        String userIds = "";
-        if(param.getTableName().equals("seal_apply")){ //用印申请
-            userIds = sysBaseAPI.getUserByRoleCode("SY002", null);//财务经理
-        }else{
-            userIds = sysBaseAPI.getUserByRoleCode("SY003", null);//办公室
-        }
-        if(StringUtils.isNotBlank(userIds)){
-            if(userIds.contains(loginUser.getUsername())){
+        if(map.get("userId") != null){
+            int ifExist = sysBaseAPI.queryDictCountBy("special_powers_user",loginUser.getUsername(),param.getTableName());
+            if(ifExist > 0){
                 map.put("userId",null);//当前登陆人
             }
         }
@@ -920,8 +929,17 @@ public class ActBusinessController {
 //                    sb2.append(" and cl.id in( select incident_ticket_id from incident_ticket_children where plan_number ").append(" = '").append(val1).append("' ) ");
 //                    continue;
 //                }
+
+
                 if (type.equals("text")){
-                    sb2.append(" and cl.").append(name).append(" like '%").append(val1).append("%' ");
+
+                    if("responsibility_person1".equals(name) && "incident_ticket".equals(param.getTableName())){
+                        sb2.append(" and CONCAT(cl.responsibility_person1,responsibility_person2,responsibility_person3,responsibility_person4) ")
+                                .append(" like '%").append(val1).append("%' ");
+                    }else{
+                        sb2.append(" and cl.").append(name).append(" like '%").append(val1).append("%' ");
+                    }
+
                 }
                 if (type.equals("list")){
                     sb2.append(" and cl.").append(name).append(" = '").append(val1).append("' ");