commit

src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubRegistApplyController.java

@@ -216,6 +216,7 @@ public class ClubRegistApplyController {
         Map<String, User> userMap = userList.stream().collect(Collectors.toMap(User::getId, o -> o));
 
         managePerson.forEach(item -> {
+            if(StrUtil.isNotBlank(item.getString("userId"))) {
                 Sys_club_user cUser = new Sys_club_user();
                 Sys_club_user fetch = dao.fetch(Sys_club_user.class, Cnd.where("clubid", "=", club.getId())
                         .and("userid", "=", item.getString("userId")));
@@ -249,6 +250,7 @@ public class ClubRegistApplyController {
                     uRole.setStid(club.getId());
                     userRoles.add(uRole);
                 }
+            }
         });
 
         List<String> manageUserIdList = managePerson.stream().map(o -> o.getString("userId")).toList();

src/main/java/io/v/nutz/web/commons/controller/ViCommonCon.java

@@ -127,7 +127,7 @@ public class ViCommonCon {
     @At
     @ViReturn
     public Object queryUserByIds(String[] ids) {
-        Sql sql = Sqls.create("select id,loginname,username,unitname,unionname,sex from user where id in (@id)");
+        Sql sql = Sqls.create("select id,loginname,username,unitname,unionname,sex,mobile from user where id in (@id)");
         sql.setParam("id", ids);
         return sysUserService.listMap(sql);
     }

src/main/resources/views/platform/sys/club/regist/clubRegistApply.html

@@ -332,7 +332,7 @@ layout("/layouts/platform.html"){
                         </el-table-column>
                         <el-table-column>
                             <template slot="header" slot-scope="scope">
-                                <el-button type="primary" @click="clubUserTableData.push({invite: true})" size="mini">增加</el-button>
+                                <el-button type="primary" @click="clubUserTableData.push({invite: true})" size="mini">邀请入会</el-button>
                             </template>
                             <template slot-scope="scope">
                                 <el-button type="danger"
@@ -670,14 +670,7 @@ layout("/layouts/platform.html"){
                         this.$message.warning('理事机构成员要求不少于3人')
                         return
                     }*/
-                    let clubUserValid = false
-                    this.managePerson.forEach(item => {
-                        if(!item.userId) {
-                            clubUserValid = true
-                            return
-                        }
-                    })
-                    if (!flag && (this.clubUserTableData.length < 20 || clubUserValid)) {
+                    if (!flag && this.clubUserTableData.length < 20) {
                         this.$message.warning('请至少选择20位协会成员')
                         return
                     }