commit

src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyUnionGroupApprovalController.java

@@ -45,6 +45,11 @@ public class MemberApplyUnionGroupApprovalController {
     @SaCheckPermission("member.apply.unionGroupApproval")
     public void index() {}
 
+    @At
+    @Ok("beetl:/platform/zhghh5/staffmanage/member/apply/uniongroupapproval/index.html")
+    @SaCheckPermission("h5.member.apply.uniongroupapproval")
+    public void h5() {
+    }
 
     @At
     @ApiOperation("会员入会申请工会小组审核列表")

src/main/java/com/budwk/app/zhgh/staffmanage/member/interceptor/MemberApplySchoolApprovalInterceptor.java

@@ -2,12 +2,15 @@ package com.budwk.app.zhgh.staffmanage.member.interceptor;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.flow.constant.FlowConst;
 import com.budwk.app.flow.engine.FlowInterceptor;
 import com.budwk.app.flow.engine.core.Execution;
 import com.budwk.app.flow.engine.core.ServiceContext;
 import com.budwk.app.flow.enums.ProcessSubmitTypeEnum;
+import com.budwk.app.sys.models.Sys_role;
 import com.budwk.app.sys.models.Sys_user;
+import com.budwk.app.sys.models.Sys_user_role;
 import com.budwk.app.zhgh.staffmanage.member.models.MemberApplyRecord;
 import org.nutz.dao.Chain;
 import org.nutz.dao.Cnd;
@@ -45,6 +48,18 @@ public class MemberApplySchoolApprovalInterceptor implements FlowInterceptor {
                 BeanUtil.copyProperties(record, sysUser);
                 sysUser.setId(record.getUserId());
                 dao.updateIgnoreNull(sysUser);
+
+                // 还要设置会员角色
+                Sys_role role = dao.fetch(Sys_role.class, Cnd.where(Sys_role::getCode, "=", RoleConstant.MEMBER.name()));
+
+                int count = dao.count(Sys_user_role.class, Cnd.where("userId", "=", record.getUserId()).and("roleId", "=", role.getId()));
+                if (count == 0) {
+                    Sys_user_role userRole = new Sys_user_role();
+                    userRole.setUserId(record.getUserId());
+                    userRole.setRoleId(role.getId());
+                    dao.insert(userRole);
+                }
+
                 // 正常的发送短信，审核通过
             } else {
                 // 发TMD短信 HMC，流程在流转到分工会接收环节