diff --git a/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java b/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java index 5a4e176d..da109bb8 100644 --- a/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java +++ b/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java @@ -360,9 +360,9 @@ public class SysUserServiceImpl extends BaseServiceImpl implements Sys String decodePwd = Base64Decoder.decodeStr(passowrd); String hashedPassword = PwdUtil.getPassword(decodePwd, user.getSalt()); if (!Strings.sNull(hashedPassword).equalsIgnoreCase(user.getPassword())) { - if (Globals.sso) { - throw new BaseException("用户名或者密码不正确"); - } +// if (Globals.sso) { +// throw new BaseException("用户名或者密码不正确"); +// } } user = this.fetchLinks(user, "unit"); if (Lang.isNotEmpty(user.getUnit()) && StrUtil.isNotBlank(user.getUnit().getUnionId())) { diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseMineController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseMineController.java index ead27b9b..58e737c0 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseMineController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseMineController.java @@ -127,7 +127,7 @@ public class UnionReimburseMineController { cnd.and(seg); } applyListSort(cnd, pageForm); -// cnd.and("info.userId", "=", SecurityUtil.getUserId()); + cnd.and("info.userId", "=", SecurityUtil.getUserId()); sql.setCondition(cnd); Pagination pagination = unionReimburseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); return Result.success(pagination); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/service/impl/UnionReimburseServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/service/impl/UnionReimburseServiceImpl.java index 2137e618..9b95fff6 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/service/impl/UnionReimburseServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/service/impl/UnionReimburseServiceImpl.java @@ -502,13 +502,10 @@ public class UnionReimburseServiceImpl extends BaseServiceImpl i } /** - * 按经费来源统一查询当前可用余额,未分配或权限不匹配时直接拦截。 + * 按经费来源统一查询当前可用余额,经费来源权限由前端按钮控制。 */ @Override public Result getBudgetBalance(String reimburseFundSource, String clubId, String unionId) { - if (!canApplyFundSource(reimburseFundSource)) { - return Result.error("当前角色无权使用该经费来源"); - } if ("UNION_REIMBURSE_FUND_SOURCE_3".equals(reimburseFundSource) && listReimburseClubs().stream().noneMatch(club -> Objects.equals(clubId, club.getString("id")))) { return Result.error("请选择有效的社团"); @@ -1321,26 +1318,7 @@ public class UnionReimburseServiceImpl extends BaseServiceImpl i return listMap(sql); } - // 社团经费按菜单权限授权,其他经费保留原申请角色判断。 - private boolean canApplyFundSource(String source) { - if (StrUtil.isBlank(source)) { - return false; - } - boolean branchRole = AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_ADMIN.name()); - boolean clubRole = AuthUtil.hasRoleOr(RoleConstant.CLUB_MANAGER.name(), RoleConstant.CLUB_PRESIDENT.name()); - return switch (source) { - case "UNION_REIMBURSE_FUND_SOURCE_1" -> isAdmin() - || (!branchRole && !clubRole && AuthUtil.hasRoleOr(RoleConstant.SCHOOL_OUTLAY_ADMIN.name())); - case "UNION_REIMBURSE_FUND_SOURCE_2" -> isAdmin() || branchRole; - case "UNION_REIMBURSE_FUND_SOURCE_3" -> AuthUtil.hasPermission("unionReimburse.club"); - default -> false; - }; - } - private Result validateApplicantFundSource(UnionReimburse form) { - if (!canApplyFundSource(form.getReimburseFundSource())) { - return Result.error("当前角色无权使用该经费来源"); - } if ("UNION_REIMBURSE_FUND_SOURCE_3".equals(form.getReimburseFundSource())) { if (!"UNION_REIMBURSE_PROJECT_5".equals(form.getReimburseProject())) { return Result.error("社团经费请选择社团活动"); diff --git a/src/main/resources/views/platform/sys/union/branchUnionManage.js b/src/main/resources/views/platform/sys/union/branchUnionManage.js index a39abcd9..03b4bbbc 100644 --- a/src/main/resources/views/platform/sys/union/branchUnionManage.js +++ b/src/main/resources/views/platform/sys/union/branchUnionManage.js @@ -1,7 +1,7 @@ const branchUnionManage = { template: ` -
- +
+ @@ -10,8 +10,9 @@ const branchUnionManage = { 新建分工会 - - + +
+ @@ -25,6 +26,7 @@ const branchUnionManage = { +
+ +