From 73a42d3f1c00b86549b22fe0e1ad6b8ed7bc7b25 Mon Sep 17 00:00:00 2001
From: zhouhefeng <zhouhefeng915@163.com>
Date: Mon, 10 Feb 2025 15:09:18 +0800
Subject: [PATCH] commit

---
 .../java/io/v/nutz/web/commons/controller/ViCommonCon.java  | 3 ++-
 .../io/v/nutz/zhgh/zc/controller/ZgfwGdzcbgController.java  | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/v/nutz/web/commons/controller/ViCommonCon.java b/src/main/java/io/v/nutz/web/commons/controller/ViCommonCon.java
index 325dd8a..66e8fa1 100644
--- a/src/main/java/io/v/nutz/web/commons/controller/ViCommonCon.java
+++ b/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
diff --git a/src/main/java/io/v/nutz/zhgh/zc/controller/ZgfwGdzcbgController.java b/src/main/java/io/v/nutz/zhgh/zc/controller/ZgfwGdzcbgController.java
index 15c5e51..ff9877e 100644
--- a/src/main/java/io/v/nutz/zhgh/zc/controller/ZgfwGdzcbgController.java
+++ b/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()));
         }