commit

src/main/java/io/v/nutz/web/commons/controller/ViCommonCon.java

@@ -682,7 +682,8 @@ public class ViCommonCon {
                  u.sex,
                  unit.`id` unitid,
                  unit.`name` unitname,
-                 un.unionname
+                 un.unionname,
+                 un.id unionid
                 FROM
                  sys_user u
                  LEFT JOIN sys_unit unit ON u.unitid = unit.id

src/main/java/io/v/nutz/zhgh/zc/controller/ZgfwGdzcbgController.java

@@ -104,6 +104,12 @@ public class ZgfwGdzcbgController {
                 $condition
                     """).setParam("zcpdid", zcpdid);
         Cnd cnd = Cnd.NEW();
+        if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) {
+           cnd.andEX("xx.zcghlx", "=", "1");
+           cnd.andEX("xx.zclydwhid", "=", Vi.getUnionId());
+        } else {
+//                cndPlus.andExcludeEmpty("zc.zcghlx", "=", "2");
+        }
         if (StrUtil.isNotBlank(pageForm.getSearchKeyword()) && StrUtil.isNotBlank(pageForm.getSearchName())) {
             cnd.and(Cnd.likeEX(pageForm.getSearchName(), pageForm.getSearchKeyword()));
         }