会员 + 工会小组

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/interceptor/MemberApplySchoolApprovalInterceptor.java

@@ -47,6 +47,8 @@ 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);
 
                 // 还要设置会员角色