From 49769b7d4f3effebcb64bd44bffd819a76abe99d Mon Sep 17 00:00:00 2001
From: "@jyuhsin" <729757837@qq.com>
Date: Mon, 17 Nov 2025 13:52:24 +0800
Subject: [PATCH] commit

---
 .../budwk/app/sys/controller/SysUserController.java  |  4 ++++
 .../controller/ActivityBasicScopeController.java     | 12 +++++++++---
 src/main/resources/views/layouts/platform.html       |  2 --
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/budwk/app/sys/controller/SysUserController.java b/src/main/java/com/budwk/app/sys/controller/SysUserController.java
index 48df3f1..03d93b8 100644
--- a/src/main/java/com/budwk/app/sys/controller/SysUserController.java
+++ b/src/main/java/com/budwk/app/sys/controller/SysUserController.java
@@ -361,6 +361,10 @@ public class SysUserController {
         if (StrUtil.isBlank(pathname)) {
 
         }
+		int i = pathname.indexOf("?");
+		if(i > 0) {
+			pathname = pathname.substring(0, i);
+		}
 //        Sys_menu menu = sysMenuService.fetch(Cnd.where(Sys_menu::getHref, "like", pathname + "%"));
         Sys_menu menu = sysMenuService.fetch(Cnd.where(Sys_menu::getHref, "=", pathname));
         if (menu == null) {
diff --git a/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java b/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java
index 8932dc2..a2f2637 100644
--- a/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java
+++ b/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java
@@ -18,6 +18,7 @@ import com.budwk.app.base.service.BaseService;
 import com.budwk.app.base.utils.CommonDownloadUtil;
 import com.budwk.app.base.utils.easyexcel.EasyExcelUtil;
 import com.budwk.app.sys.models.Sys_role;
+import com.budwk.app.web.commons.auth.utils.AuthUtil;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
 import com.budwk.app.zhgh.activity.basic.models.ActivityUserScope;
 import com.budwk.app.zhgh.activity.basic.param.ActivityUserScopePageParam;
@@ -32,6 +33,7 @@ import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
 import org.nutz.dao.util.cri.Static;
 import org.nutz.integration.jedis.RedisService;
 import org.nutz.ioc.loader.annotation.Inject;
@@ -196,9 +198,13 @@ public class ActivityBasicScopeController {
                 $condition
                 """);
         Cnd cnd = Cnd.NEW();
-        if (!StpUtil.hasRole(RoleConstant.SYSADMIN.name()) &&
-                !StpUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name())) {
-            cnd.and("creator", "=", SecurityUtil.getUserId());
+        if (!StpUtil.hasRole(RoleConstant.SYSADMIN.name()) && !StpUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name())) {
+			SqlExpressionGroup group = new SqlExpressionGroup();
+			group.or("creator", "=", SecurityUtil.getUserId());
+			if(AuthUtil.hasRole(RoleConstant.CLUB_PRESIDENT.name())) {
+				group.or("groupName", "like", "%社%");
+			}
+			cnd.and(group);
         }
         cnd.and("groupId", "IS NOT", null);
         cnd.and("groupName", "IS NOT", null);
diff --git a/src/main/resources/views/layouts/platform.html b/src/main/resources/views/layouts/platform.html
index 54187e6..fa9a822 100644
--- a/src/main/resources/views/layouts/platform.html
+++ b/src/main/resources/views/layouts/platform.html
@@ -348,7 +348,6 @@ layout("/layouts/v4/baseLayout.html"){
             // 菜单回显
             echoMenus() {
                 try {
-                    debugger
                     const app = JSON.parse(window.sessionStorage.getItem("zhgh_sub_app"))
                     this.activeMenuIndex = window.sessionStorage.getItem("zhgh_sub_app_left_menu_active_index-" + app.id)
                     this.openedMenus = JSON.parse(window.sessionStorage.getItem("zhgh_sub_app_left_menu_opens-" + app.id)) || []
@@ -387,7 +386,6 @@ layout("/layouts/v4/baseLayout.html"){
                 }
 
                 const result = findMenuPath(this.menus, getBaseSubAppPath())
-                    debugger
                 if(result){
                     this.activeMenuIndex = result[result.length-1]['id']
                     this.openedMenus = result.map(v=>v.id)