Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4

src/main/java/com/budwk/app/sys/controller/SysUnionGroupController.java

@@ -21,8 +21,10 @@ import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.util.NutMap;
 import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
 
 import javax.validation.Valid;
+import java.util.Arrays;
 import java.util.List;
 
 @IocBean
@@ -82,8 +84,11 @@ public class SysUnionGroupController {
     @At
     @SaCheckPermission("sys.manager.union")
     @ApiOperation("获取非工会小组组长人员")
-    public Result listUser(@Valid String unionId, String keyword) {
-        List<NutMap> list = sysUnionGroupService.listNotLeader(unionId, keyword);
+    public Result listUser(@Valid @Param("unionId") String unionId,
+                           @Param("keyword") String keyword,
+                           @Param("userIds") String[] userIds) {
+        System.out.println(Arrays.toString(userIds));
+        List<NutMap> list = sysUnionGroupService.listNotLeader(unionId, keyword, Arrays.asList(userIds));
         return Result.success(list);
     }
 

src/main/java/com/budwk/app/sys/services/SysUnionGroupService.java

@@ -22,8 +22,9 @@ public interface SysUnionGroupService extends BaseService<Sys_union_group> {
      * 查询非组长的成员
      * @param unionId 分工会id
      * @param keyword 关键字
+     * @param userIds 用户Id
      */
-    List<NutMap> listNotLeader(String unionId, String keyword);
+    List<NutMap> listNotLeader(String unionId, String keyword, List<String> userIds);
 
     /**
      * 分页查询

src/main/java/com/budwk/app/sys/services/impl/SysUnionGroupServiceImpl.java

@@ -22,6 +22,7 @@ import org.nutz.dao.util.cri.SqlExpressionGroup;
 import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.Lang;
 import org.nutz.lang.util.NutMap;
 
 import java.util.List;
@@ -72,14 +73,19 @@ public class SysUnionGroupServiceImpl extends BaseServiceImpl<Sys_union_group> i
     }
 
     @Override
-    public List<NutMap> listNotLeader(String unionId, String keyword) {
+    public List<NutMap> listNotLeader(String unionId, String keyword, List<String> userIds) {
         Sql sql = Sqls.create("select id,loginname,username,unitName from vw_user $condition limit 0,10");
         Cnd cnd = Cnd.NEW();
         cnd.and("unionId", "=", unionId);
-        SqlExpressionGroup seg = new SqlExpressionGroup();
-        seg.orLike("username", keyword);
-        seg.orLike("loginname", keyword);
-        cnd.and(seg);
+        if (StrUtil.isNotBlank(keyword)) {
+            SqlExpressionGroup seg = new SqlExpressionGroup();
+            seg.orLike("username", keyword);
+            seg.orLike("loginname", keyword);
+            cnd.and(seg);
+        } else {
+            cnd.and("id", "in", userIds);
+        }
+
         sql.setCondition(cnd);
         return listMap(sql);
     }

src/main/java/com/budwk/app/zhgh/dayofficework/buildHome/controller/BuildHomeAgencyController.java

@@ -194,7 +194,7 @@ public class BuildHomeAgencyController {
     @SaCheckPermission("buildHome.agency")
     @ApiOperation("获取非工会小组组长人员")
     public Result listUser(@Valid String keyword) {
-        List<NutMap> list = sysUnionGroupService.listNotLeader(SecurityUtil.getUnionId(), keyword);
+        List<NutMap> list = sysUnionGroupService.listNotLeader(SecurityUtil.getUnionId(), keyword, null);
         return Result.success(list);
     }
 

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;
@@ -44,7 +47,21 @@ public class MemberApplySchoolApprovalInterceptor implements FlowInterceptor {
                 Sys_user sysUser = new Sys_user();
                 BeanUtil.copyProperties(record, sysUser);
                 sysUser.setId(record.getUserId());
+                sysUser.setMember(true);
+                sysUser.setWelfareMember(true);
                 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，流程在流转到分工会接收环节