From e8e869efd3c81775329a1043e8b1bba27952cc5c Mon Sep 17 00:00:00 2001
From: zhangzhiguo <zhangzhiguo@123>
Date: Wed, 25 Jun 2025 17:07:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E7=A1=AE=E8=AE=A4=E5=8D=95?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=80=E5=B1=9E=E7=BB=84=E7=BB=87=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InContractFinaceConfirmeListPlugin.java   | 20 ++++++++++++-------
 .../OutContractFinaceConfirmeListPlugin.java  | 19 +++++++++++-------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/InContractFinaceConfirmeListPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/InContractFinaceConfirmeListPlugin.java
index 04ad573..71c62cb 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/InContractFinaceConfirmeListPlugin.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/InContractFinaceConfirmeListPlugin.java
@@ -61,13 +61,19 @@ public class InContractFinaceConfirmeListPlugin extends AbstractListPlugin imple
     @Override
     public void filterContainerBeforeF7Select(BeforeFilterF7SelectEvent args) {
         super.filterContainerBeforeF7Select(args);
-        //获取当前人员有权限的组织
-        HasPermOrgResult userHasPermOrgs = PermissionServiceHelper.getUserHasPermOrgs(Long.parseLong(RequestContext.get().getUserId()));
-        //有权的组织
-        List<Long> hasPermOrgs = userHasPermOrgs.getHasPermOrgs();
-        String fieldName = args.getFieldName();
-        if ("zcgj_org.id".equals(fieldName)) {
-            args.getQfilters().add(new QFilter("id", QCP.in, hasPermOrgs));
+        long userId = Long.parseLong(RequestContext.get().getUserId());
+        boolean superUser = PermissionServiceHelper.isSuperUser(userId); //判断是否为全功能用户
+        boolean adminUser = PermissionServiceHelper.isAdminUser(userId); //判断是否管理员用户
+        if(!superUser && !adminUser){
+            //获取当前人员有权限的组织
+            //HasPermOrgResult userHasPermOrgs = PermissionServiceHelper.getUserHasPermOrgs(userId);
+            HasPermOrgResult userHasPermOrgs = PermissionServiceHelper.getUserHasPermOrgs(userId,true);
+            //有权的组织
+            List<Long> hasPermOrgs = userHasPermOrgs.getHasPermOrgs();
+            String fieldName = args.getFieldName();
+            if ("zcgj_org.id".equals(fieldName)) {
+                args.getQfilters().add(new QFilter("id", QCP.in, hasPermOrgs));
+            }
         }
     }
 
diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFinaceConfirmeListPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFinaceConfirmeListPlugin.java
index 1574c88..1cfaf83 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFinaceConfirmeListPlugin.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFinaceConfirmeListPlugin.java
@@ -72,13 +72,18 @@ public class OutContractFinaceConfirmeListPlugin extends AbstractListPlugin impl
     @Override
     public void filterContainerBeforeF7Select(BeforeFilterF7SelectEvent args) {
         super.filterContainerBeforeF7Select(args);
-        //获取当前人员有权限的组织
-        HasPermOrgResult userHasPermOrgs = PermissionServiceHelper.getUserHasPermOrgs(Long.parseLong(RequestContext.get().getUserId()));
-        //有权的组织
-        List<Long> hasPermOrgs = userHasPermOrgs.getHasPermOrgs();
-        String fieldName = args.getFieldName();
-        if ("zcgj_org.id".equals(fieldName)) {
-            args.getQfilters().add(new QFilter("id", QCP.in, hasPermOrgs));
+        long userId = Long.parseLong(RequestContext.get().getUserId());
+        boolean superUser = PermissionServiceHelper.isSuperUser(userId); //判断是否为全功能用户
+        boolean adminUser = PermissionServiceHelper.isAdminUser(userId); //判断是否管理员用户
+        if(!superUser && !adminUser) {
+            //获取当前人员有权限的组织
+            HasPermOrgResult userHasPermOrgs = PermissionServiceHelper.getUserHasPermOrgs(Long.parseLong(RequestContext.get().getUserId()));
+            //有权的组织
+            List<Long> hasPermOrgs = userHasPermOrgs.getHasPermOrgs();
+            String fieldName = args.getFieldName();
+            if ("zcgj_org.id".equals(fieldName)) {
+                args.getQfilters().add(new QFilter("id", QCP.in, hasPermOrgs));
+            }
         }
     }