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 a2f2637..8269a88 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 @@ -376,7 +376,9 @@ public class ActivityBasicScopeController { try { - + if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())){ + cnd.andEX("u.unionid", "=", SecurityUtil.getUnionId()); + } cnd.andEX("u.unionid", EQ_OR_NEQ_OP, activityUserScopePageParam.getUnionId()); cnd.andEX("u.unitid", EQ_OR_NEQ_OP, activityUserScopePageParam.getUnitId()); cnd.andEX("u.personType", IN_OR_NIN_OP, activityUserScopePageParam.getPersonTypes()); diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java index 0277633..ebf6413 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java @@ -145,7 +145,7 @@ public class ActivityDeclareMineController { @At @ApiOperation("活动申报,查看活动申报") - @SaCheckPermission("activityDeclare.mine") + @SaCheckPermission("activityDeclare") public Result findOne(@Valid String id) { ActivityDeclareInfo info = dao.fetch(ActivityDeclareInfo.class, id); return Result.success().addData(info); diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolUnionController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolUnionController.java index 8d04806..a33b7f6 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolUnionController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolUnionController.java @@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.cri.SqlExpressionGroup; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.lang.util.NutMap; @@ -94,8 +95,6 @@ public class ActivityDeclareSchoolUnionController { $condition """); Cnd cnd = Cnd.NEW(); - pageParam.buildSearch(cnd, "info."); - cnd.and("t.taskName", "=", "81428a9b-63c0-44b8-a28c-17d282c2cc8e"); cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); @@ -105,6 +104,13 @@ public class ActivityDeclareSchoolUnionController { cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); } + if (StrUtil.isNotBlank(pageParam.getSearchKeyword())) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.orLike("info.userName", pageParam.getSearchKeyword()); + seg.orLike("info.loginName", pageParam.getSearchKeyword()); + cnd.and(seg); + } + if (StrUtil.isAllBlank(pageParam.getPageOrderName(), pageParam.getPageOrderBy())) { cnd.desc("info.applyTime"); } else { diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/controller/BlessingUserController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/controller/BlessingUserController.java index e625d85..2d08146 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/controller/BlessingUserController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/blessing/controller/BlessingUserController.java @@ -48,7 +48,7 @@ public class BlessingUserController { FROM blessing_user blu LEFT JOIN blessing bl ON bl.id = blu.blessingId - LEFT JOIN `user` u ON u.id = blu.userId + LEFT JOIN `vw_user` u ON u.id = blu.userId $condition """); if (Strings.isNotBlank(pageForm.getSearchKeyword()) && Strings.isNotBlank(pageForm.getSearchName())) { diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html index fd92510..d75ff41 100644 --- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html @@ -356,7 +356,7 @@ layout("/layouts/platform.html"){ } }) } - if (this.$auth.hasRoleOr(["BRANCH_UNION_WENTI_SPORTS", "UNION_REIMBURSEMENT_MANAGER"])) { + if (this.$auth.hasRoleOr(["BRANCH_UNION_WENTI_SPORTS", "BRANCH_UNION_CHAIRMAN"])) { this.activityDeclareReimbursementList.map(v => { if (["BRANCH_UNION"].includes(v.name)) { activityDeclareReimbursementList.push(v) diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/blessing/blessingUser.html b/src/main/resources/views/platform/zhgh/staffbenefit/blessing/blessingUser.html index 67f2419..8b48037 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/blessing/blessingUser.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/blessing/blessingUser.html @@ -46,14 +46,13 @@ layout("/layouts/platform.html"){ -
+
所属工会：
+ filterable>
@@ -63,8 +62,8 @@ layout("/layouts/platform.html"){
所属单位：
+ clearable + filterable>
@@ -83,49 +82,41 @@ layout("/layouts/platform.html"){
- +
搜索 - -
- - - - - - - -