会员 + 工会小组

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) {
+    public Result listUser(@Valid @Param("unionId") String unionId,
-        List<NutMap> list = sysUnionGroupService.listNotLeader(unionId, keyword);
+                           @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();
+        if (StrUtil.isNotBlank(keyword)) {
-        seg.orLike("username", keyword);
+            SqlExpressionGroup seg = new SqlExpressionGroup();
-        seg.orLike("loginname", keyword);
+            seg.orLike("username", keyword);
-        cnd.and(seg);
+            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/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);
 
                 // 还要设置会员角色

src/main/resources/views/platform/sys/union/branchUnionGroupManage.js

@@ -113,8 +113,10 @@ const branchUnionGroupManage = {
 
         async onEdit(row) {
             this.formData = { ...row }
+            this.formData.unitIds = JSON.parse(row.unitIds)
+            this.formData.leaders = JSON.parse(row.leaders)
             await this.getUnits(row.id)
-            this.getUserOptions(row.leaderUserName)
+            this.getUserOptions(null, this.formData.leaders)
             this.dialogFormVisible = true
             this.$nextTick(() => {
                 this.$refs.formRef.clearValidate()
@@ -166,8 +168,12 @@ const branchUnionGroupManage = {
             })
         },
 
-        getUserOptions(keyword) {
+        getUserOptions(keyword, userIds = null) {
-            $.get("/platform/sys/unionGroup/listUser", { keyword, unionId: this.union_id }).then((res) => {
+            $.get("/platform/sys/unionGroup/listUser", {
+                keyword,
+                unionId: this.union_id,
+                userIds: JSON.stringify(userIds)
+            }).then((res) => {
                 if (res.code === 0) {
                     this.userOptions = res.data
                 }