c-zhouhf1/zhgh_hmc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
c-zhouhf1
2025-09-03 10:10:03 +08:00
parent 0a995e19c5
commit 6fd23df1c1
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/zhgh/jf/controller/club/clubTzController.java
+2 -2
View File
@@ -90,8 +90,8 @@ public class clubTzController {
$condition $condition
"""); """);
if (!ShiroUtil.hasRole("sysadmin")) { if (!ShiroUtil.hasRole("sysadmin")) {
cnd.and("role.roleId", "in", Lang.array(Roles.club01, Roles.club02, Roles.club03, Roles.club04)); cnd1.and("role.roleid", "in", Lang.array(Roles.club01, Roles.club02, Roles.club03, Roles.club04));
cnd.and("role.userId", "=", ShiroUtil.getUserId()); cnd1.and("role.userId", "=", ShiroUtil.getUserId());
} }
cnd1.and("club.isjs", "=", false); cnd1.and("club.isjs", "=", false);
cnd1.and("club.state", "=", 930); cnd1.and("club.state", "=", 930);
src/main/java/io/v/nutz/zhgh/jf/controller/yjgh/jfsyController.java
+1 -3
View File
@@ -75,10 +75,8 @@ public class jfsyController {
$condition $condition
"""); """);
Cnd cnd = Cnd.NEW(); Cnd cnd = Cnd.NEW();
if (ShiroUtil.hasRole("sysadmin") || ShiroUtil.hasRole("A06")) {
cnd.andEX("jf.unionId", "=", unionId); cnd.andEX("jf.unionId", "=", unionId);
} else if (ShiroUtil.hasAnyRoles("gh14,gh01")) { if (!ShiroUtil.hasRole("sysadmin") || ShiroUtil.hasRole("A06")) {
//基层工会管理员
cnd.and("jf.unionId", "=", Vi.getUnionId()); cnd.and("jf.unionId", "=", Vi.getUnionId());
} }
cnd.and("jf.totalQuota", "IS NOT", null); cnd.and("jf.totalQuota", "IS NOT", null);
src/main/resources/views/platform/jf/club/clubtz.html
-1
View File
@@ -441,7 +441,6 @@ layout("/layouts/platform.html"){
}); });
}, },
use(scope) { use(scope) {
console.log(scope)
let that = this let that = this
this.formData.id = scope.id this.formData.id = scope.id
this.usePageForm.adjust_id = scope.id this.usePageForm.adjust_id = scope.id