From 657e74be7a8e9cfc5f51fe680c1ed7e570a007ce Mon Sep 17 00:00:00 2001 From: = <=> Date: Sat, 16 May 2026 10:00:10 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E4=BA=8C=E7=BA=A7?= =?UTF-8?q?=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/web/controllers/open/commons/CommonController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/budwk/app/web/controllers/open/commons/CommonController.java b/src/main/java/com/budwk/app/web/controllers/open/commons/CommonController.java index 4535fdd..a887d55 100644 --- a/src/main/java/com/budwk/app/web/controllers/open/commons/CommonController.java +++ b/src/main/java/com/budwk/app/web/controllers/open/commons/CommonController.java @@ -135,7 +135,7 @@ public class CommonController { """); Cnd cnd = Cnd.NEW(); cnd.andEX("unit.unionId", "=", unionId); - cnd.and("unit.unitTypeCode", "=", "1"); + cnd.and("unit.unitLevel", "=", "2"); cnd.asc("unit.unitcode"); sql.setCondition(cnd); List unitList = sysUserService.listMap(sql); From df489326a7eb737a7e57e6f3e37290a92e28f96f Mon Sep 17 00:00:00 2001 From: dd3s_206 Date: Sat, 16 May 2026 11:14:30 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=89=8B=E6=9C=BAh5=E7=AB=AF-=E6=83=A0?= =?UTF-8?q?=E6=B0=91=E6=9C=8D=E5=8A=A1=EF=BC=9A=20=EF=BC=88=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=20EXISTS=20=E4=BB=A3=E6=9B=BF=20JOIN=EF=BC=89?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=A0=E4=B8=BA=E4=BA=BA=E5=91=98=E8=8C=83?= =?UTF-8?q?=E5=9B=B4userId=E9=87=8D=E5=A4=8D=E5=AF=BC=E8=87=B4=E7=9A=84?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=9F=A5=E8=AF=A2=E6=97=B6=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=86=A8=E8=83=80=E9=97=AE=E9=A2=98=EF=BC=88=E5=8D=B3=E4=B8=80?= =?UTF-8?q?=E8=A1=8C=E5=8F=98=E5=A4=9A=E8=A1=8C=EF=BC=89=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../huimin/controller/HuiminMineController.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/controller/HuiminMineController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/controller/HuiminMineController.java index cb18bf1..858d6aa 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/controller/HuiminMineController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/huimin/controller/HuiminMineController.java @@ -14,6 +14,7 @@ import lombok.extern.slf4j.Slf4j; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.cri.Static; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.mvc.annotation.At; @@ -50,8 +51,6 @@ public class HuiminMineController { t1.* FROM huimin t1 - LEFT JOIN activity_user_scope aus ON t1.groupId = aus.groupId - AND aus.userId = @userId $condition """); Cnd cnd = Cnd.NEW(); @@ -62,8 +61,8 @@ public class HuiminMineController { // 添加启用状态过滤（只显示启用的记录） cnd.and("t1.enable", "=", true); // 添加权限过滤 - cnd.and(Cnd.exps("t1.groupId", "is", null).or("aus.groupId", "is not", null)); - sql.params().set("userId", SecurityUtil.getUserId()); + cnd.and(Cnd.exps("t1.groupId", "is", null) + .or(new Static("EXISTS (SELECT 1 FROM activity_user_scope aus WHERE aus.groupId = t1.groupId AND aus.userId = '%s')".formatted(SecurityUtil.getUserId())))); sql.setCondition(cnd); Pagination pagination = huiminService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); return Result.success(pagination); From 95b66887d7ff3d7bd645ed03857ab0da470678c0 Mon Sep 17 00:00:00 2001 From: dd3s_206 Date: Sat, 16 May 2026 14:46:38 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=95=99=E4=BB=A3=E4=BC=9A=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E4=BB=A3=E8=A1=A8=E5=9B=A2=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=9A=20=E8=A1=A8=E6=A0=BC=E5=88=86=E9=A1=B5=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E8=B6=85=E5=87=BA=E8=A1=A8=E6=A0=BC=E9=AB=98=E5=BA=A6?= =?UTF-8?q?=E5=90=8E=E9=99=90=E5=88=B6=E9=AB=98=E5=BA=A6=E5=B9=B6=E5=8A=A0?= =?UTF-8?q?=E6=BB=91=E5=8A=A8=E6=9D=A1=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../teachercongress/delegation/headTable.js | 4 +- .../teachercongress/delegation/index.html | 38 +++++++++++++++++-- .../delegation/partUnitTable.js | 4 +- 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegation/headTable.js b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegation/headTable.js index 61424aa..85a6433 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegation/headTable.js +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegation/headTable.js @@ -1,10 +1,10 @@ const HEAD_TABLE_TEMPLATE = { template: ` -
+
添加团长 - + diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegation/index.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegation/index.html index 735c3a3..ad0da8b 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegation/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegation/index.html @@ -2,6 +2,38 @@ layout("/layouts/platform.html"){ #--> + +
@@ -45,9 +77,9 @@ layout("/layouts/platform.html"){ + v-if="is_A06===true||is_sysadmin===true||is_H02===true||is_CLUB_PRESIDENT===true"> 协会： diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js b/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js index 77239c4..84d02f7 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js @@ -3,8 +3,9 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {