新增特别人员查看权限

huzhou/src/main/java/com/easy/admin/common/util/CommonUtils.java

@@ -143,16 +143,22 @@ public class CommonUtils {
                     if(role.getName().contains("信息化保障团队")){
                         String roleCode = role.getCode();
                         list.add(roleCode);
+
                         if(roleCode.equals("吴兴区")){
-                            projectInfoAuthSelect.setOrDutyPlace("湖州市中心医院");
+                            String[] place ={"湖州市中心医院"};
+                            projectInfoAuthSelect.setOrDutyPlace(Arrays.asList(place));
                         }else if(roleCode.equals("南浔区")){
-                            projectInfoAuthSelect.setOrDutyPlace("湖州市第一人民医院");
+                            String[] place ={"湖州市第一人民医院"};
+                            projectInfoAuthSelect.setOrDutyPlace(Arrays.asList(place));
                         }else if(roleCode.equals("长兴县")){
-                            projectInfoAuthSelect.setOrDutyPlace("湖州市中医院");
+                            String[] place ={"湖州市中医院"};
+                            projectInfoAuthSelect.setOrDutyPlace(Arrays.asList(place));
                         }else if(roleCode.equals("德清县")){
-                            projectInfoAuthSelect.setOrDutyPlace("湖州市第三人民医院");
+                            String[] place ={"湖州市第三人民医院"};
+                            projectInfoAuthSelect.setOrDutyPlace(Arrays.asList(place));
                         }else if(roleCode.equals("安吉县")){
-                            projectInfoAuthSelect.setOrDutyPlace("湖州市妇幼保健院");
+                            String[] place ={"湖州市妇幼保健院"};
+                            projectInfoAuthSelect.setOrDutyPlace(Arrays.asList(place));
                         }else {
                             String[] noin = {"湖州市中心医院","湖州市第一人民医院","湖州市中医院","湖州市第三人民医院","湖州市妇幼保健院"};
                             projectInfoAuthSelect.setNotorDutyPlace(Arrays.asList(noin));
@@ -166,7 +172,43 @@ public class CommonUtils {
                 //其他人员查看自己有关的项目
                 projectInfoAuthSelect.setProjectContacts(currentUser.getId());
             }
-
+            //特殊人员查看项目判断判断
+            if (currentUser.getNickname().equals("蔡冬1")) {
+                String[] place ={"湖州市中心医院"};
+                String[] admin={"南浔区"};
+                projectInfoAuthSelect.setAdminDivisionList(Arrays.asList(admin));
+                String[] oradmin={"市本级"};
+                projectInfoAuthSelect.setOrDutyPlace(Arrays.asList(place));
+                projectInfoAuthSelect.setAndadminDivision(Arrays.asList(oradmin));
+            }else if(currentUser.getNickname().equals("唐璇")){
+                String[] place = {
+                        "医政处",
+                        "中医处",
+                        "财审处",
+                        "机关党委",
+                        "妇幼处",
+                        "科教处",
+                        "体改处",
+                        "规信处",
+                        "湖州市卫生健康发展中心",
+                        "湖州市妇幼保健院",
+                        "湖州市中心医院",
+                        "湖州市第一人民医院",
+                        "湖州市中心医院",
+                };
+                String[] admin={"吴兴区","安吉县"};
+                projectInfoAuthSelect.setAdminDivisionList(Arrays.asList(admin));
+                String[] oradmin={"市本级"};
+                projectInfoAuthSelect.setOrDutyPlace(Arrays.asList(place));
+                projectInfoAuthSelect.setAndadminDivision(Arrays.asList(oradmin));
+            }else if(currentUser.getNickname().equals("唐磊")){
+                String[] place ={"湖州市中医院","湖州市第三人民医院"};
+                String[] admin={"长兴县","德清县"};
+                projectInfoAuthSelect.setAdminDivisionList(Arrays.asList(admin));
+                String[] oradmin={"市本级"};
+                projectInfoAuthSelect.setOrDutyPlace(Arrays.asList(place));
+                projectInfoAuthSelect.setAndadminDivision(Arrays.asList(oradmin));
+            }
         }
         return projectInfoAuthSelect;
     }

huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectinfoMapper.xml

@@ -112,7 +112,17 @@
             </foreach>
         </if>
         <if test="info.orDutyPlace!=null">
-            or u.duty_workplace =#{info.orDutyPlace}
+            or( u.duty_workplace in
+            <foreach item="str" index="index" collection="info.orDutyPlace" open="(" separator="," close=")">
+                #{str}
+            </foreach>
+            <if test="info.andadminDivision!=null">
+                and u.admin_division in
+                <foreach item="str1" index="index" collection="info.andadminDivision" open="(" separator="," close=")">
+                    #{str1}
+                </foreach>
+            </if>
+             )
         </if>
         <if test="info.notorDutyPlace!=null">
              and u.duty_workplace not in

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java

@@ -609,7 +609,7 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl<HuzhouPlaninfoMapper,
 
     @Override
     public IPage<HuzhouProjectinfoOV> projectPlanPageList(HuzhouProjectinfo projectinfo, Integer pageNo, Integer pageSize, String newStage) {
-//        runtimeService.deleteProcessInstance("454855","停止流程");
+//        runtimeService.deleteProcessInstance("472501","停止流程");
 //        runtimeService.deleteProcessInstance("423634","停止流程");
 //        runtimeService.deleteProcessInstance("415628","停止流程");
 //        runtimeService.deleteProcessInstance("415680","停止流程");

huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/ProjectInfoAuthSelect.java

@@ -10,7 +10,8 @@ public class ProjectInfoAuthSelect extends HuzhouProjectinfo {
 
     List<String> superLeaderList;
     List<String> adminDivisionList;
-    String orDutyPlace;
+    List<String> orDutyPlace;
+    List<String> andadminDivision;
     List<String> notorDutyPlace;
     List<String> utrIsfinishList;
 }