diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/club/clubTzController.java b/src/main/java/io/v/nutz/zhgh/jf/controller/club/clubTzController.java index 32050cd..692ce4d 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/club/clubTzController.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/club/clubTzController.java @@ -90,8 +90,8 @@ public class clubTzController { $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()); + cnd1.and("role.roleid", "in", Lang.array(Roles.club01, Roles.club02, Roles.club03, Roles.club04)); + cnd1.and("role.userId", "=", ShiroUtil.getUserId()); } cnd1.and("club.isjs", "=", false); cnd1.and("club.state", "=", 930); diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/yjgh/jfsyController.java b/src/main/java/io/v/nutz/zhgh/jf/controller/yjgh/jfsyController.java index 47bfa78..8080b6d 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/yjgh/jfsyController.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/yjgh/jfsyController.java @@ -75,10 +75,8 @@ public class jfsyController { $condition """); Cnd cnd = Cnd.NEW(); - if (ShiroUtil.hasRole("sysadmin") || ShiroUtil.hasRole("A06")) { - cnd.andEX("jf.unionId", "=", unionId); - } else if (ShiroUtil.hasAnyRoles("gh14,gh01")) { - //基层工会管理员 + cnd.andEX("jf.unionId", "=", unionId); + if (!ShiroUtil.hasRole("sysadmin") || ShiroUtil.hasRole("A06")) { cnd.and("jf.unionId", "=", Vi.getUnionId()); } cnd.and("jf.totalQuota", "IS NOT", null); diff --git a/src/main/resources/views/platform/jf/club/clubtz.html b/src/main/resources/views/platform/jf/club/clubtz.html index ac61005..9563d0b 100644 --- a/src/main/resources/views/platform/jf/club/clubtz.html +++ b/src/main/resources/views/platform/jf/club/clubtz.html @@ -441,7 +441,6 @@ layout("/layouts/platform.html"){ }); }, use(scope) { - console.log(scope) let that = this this.formData.id = scope.id this.usePageForm.adjust_id = scope.id