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

慰问对象只能是会员身份，分工会委员可以申请本工会的，

Browse Source
This commit is contained in:
c-hongqw1
2026-09-02 16:40:57 +08:00
parent 32b288053a
commit 853131297e
5 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/controller/ExerciseCardApplyController.java
+2
View File
@@ -93,6 +93,8 @@ public class ExerciseCardApplyController {
$condition
""");
Cnd cnd = Cnd.NEW();
// 健身卡信息填报对象必须是工会会员，会员标识为 1。
cnd.and("member", "=", 1);
if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_ADMIN.name(), RoleConstant.BRANCH_UNION_OPERATOR.name())) {
src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseApplyController.java
+2
View File
@@ -165,6 +165,8 @@ public class UnionReimburseApplyController {
$condition
""");
Cnd cnd = Cnd.NEW();
// 慰问报销对象必须是工会会员，会员标识为 1。
cnd.and("member", "=", 1);
if (StrUtil.isNotBlank(keyword)) {
SqlExpressionGroup seg = new SqlExpressionGroup();
seg.or(View_user::getLoginname, "like", "%" + keyword + "%");
src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceApplyController.java
+4 -1
View File
@@ -138,6 +138,8 @@ public class CondolenceApplyController {
$condition
""");
Cnd cnd = Cnd.NEW();
// 慰问对象必须是工会会员，会员标识为 1，未入会或会员状态为空的人员不纳入选择范围。
cnd.and(View_user::getMember, "=", 1);
if (StrUtil.isNotBlank(keyword)) {
SqlExpressionGroup seg = new SqlExpressionGroup();
seg.or(View_user::getLoginname, "like", "%" + keyword + "%");
@@ -145,7 +147,8 @@ public class CondolenceApplyController {
cnd.and(seg);
}
if(!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
if(AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_ADMIN.name(), RoleConstant.BRANCH_UNION_CHAIRMAN.name())) {
// 分工会管理员、主席和委员只能为当前所属分工会人员发起慰问申请。
if(AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_ADMIN.name(), RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_WY.name())) {
cnd.and(View_user::getUnionId, "=", SecurityUtil.getUnionId());
} else {
cnd.and(View_user::getId, "=", SecurityUtil.getUserId());
src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpApplyController.java
+2
View File
@@ -149,6 +149,8 @@ public class DifficultHelpApplyController {
$condition
""");
Cnd cnd = Cnd.NEW();
// 困难帮扶受助人必须是工会会员，会员标识为 1。
cnd.and("member", "=", 1);
cnd.and("id", "<>", SecurityUtil.getUserId());
if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_ADMIN.name(), RoleConstant.BRANCH_UNION_OPERATOR.name())) {
src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/controller/MutualInsuranceApplyController.java
+2
View File
@@ -144,6 +144,8 @@ public class MutualInsuranceApplyController {
$condition
""");
Cnd cnd = Cnd.NEW();
// 互助保障受助人必须是工会会员，会员标识为 1。
cnd.and("member", "=", 1);
if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_CHAIRMAN.name(), RoleConstant.BRANCH_UNION_ADMIN.name(), RoleConstant.BRANCH_UNION_OPERATOR.name())) {