commit

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

@@ -11,14 +11,11 @@ import io.v.nutz.base.utils.Roles;
 import io.v.nutz.base.utils.Vi;
 import io.v.nutz.base.service.ViService;
 import io.v.nutz.base.utils.ViResource;
-import io.v.nutz.sys.models.Sys_union;
-import io.v.nutz.sys.models.Sys_unit;
+import io.v.nutz.sys.models.*;
 import io.v.nutz.sys.services.*;
 import io.v.nutz.web.commons.utils.ShiroUtil;
 import io.v.nutz.zhgh.activity.models.ActivityBasicUnit;
 import io.v.nutz.zhgh.jdh.model.zzjg.Jdh_dbt;
-import io.v.nutz.sys.models.SysUnionGroup;
-import io.v.nutz.sys.models.Sys_user_role;
 import io.v.nutz.zhgh.jdh.model.zzjg.Jdh_dbt_zcdw;
 import io.v.nutz.zhgh.workersCongress.model.workersCongressSession;
 import lombok.extern.slf4j.Slf4j;
@@ -429,6 +426,7 @@ public class ViCommonCon {
         Cnd cnd = Cnd.NEW();
         Sql sql = Sqls.create("""
                 SELECT
+                 club.sponsorType,
                  club.id as stid,
                  role.userId,
                  club.`name`,
@@ -441,8 +439,13 @@ public class ViCommonCon {
                 $condition
                 """);
         if (!ShiroUtil.hasRole("sysadmin")) {
-            cnd.and("role.roleId", "in", Lang.array(Roles.club01, Roles.club02, Roles.club03, Roles.club04));
-            cnd.and("role.userId", "=", ShiroUtil.getUserId());
+            if(ShiroUtil.hasRole("gh03")) {
+                List<Sys_user> sysUsers = dao.query(Sys_user.class, Cnd.where("unitId", "=", ShiroUtil.getUnitId()));
+                cnd.and("club.userId", "in", sysUsers.stream().map(Sys_user::getId).collect(Collectors.toList()));
+            } else {
+                cnd.and("role.roleId", "in", Lang.array(Roles.club01, Roles.club02, Roles.club03, Roles.club04));
+                cnd.and("role.userId", "=", ShiroUtil.getUserId());
+            }
         }
         cnd.and("club.isjs", "=", false);
         cnd.and("club.state", "=", 930);