From d94a12e0ca3617c54fb776386c4bb872ddfeb7b0 Mon Sep 17 00:00:00 2001
From: "@jyuhsin" <729757837@qq.com>
Date: Thu, 9 Jan 2025 13:54:04 +0800
Subject: [PATCH] commit

---
 .../regist/ClubRegistApplyController.java     | 64 ++++++++++---------
 .../web/commons/controller/ViCommonCon.java   |  2 +-
 .../sys/club/regist/clubRegistApply.html      | 11 +---
 3 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubRegistApplyController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubRegistApplyController.java
index 7b52aac..4d5aee3 100644
--- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubRegistApplyController.java
+++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubRegistApplyController.java
@@ -216,38 +216,40 @@ public class ClubRegistApplyController {
         Map<String, User> userMap = userList.stream().collect(Collectors.toMap(User::getId, o -> o));
 
         managePerson.forEach(item -> {
-            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")));
-            User user = userMap.get(item.getString("userId"));
-            if (fetch != null) {
-                cUser = fetch;
-                cUser.setUserid(item.getString("userId"));
-                cUser.setSf(item.getInt("sf"));
-            } else {
-                cUser.setClubid(club.getId());
-                cUser.setUserid(item.getString("userId"));
-                cUser.setJoin_time(DateUtil.getDateTime());
-                cUser.setSf(item.getInt("sf"));
-                cUser.setIsjf(true);
-                cUser.setStatus(5);
-                cUser.setGiveMoney(true);
-                cUser.setIsNormal(true);
-                cUser.setMobile(user != null ? user.getMobile() : "");
-                cUser.setUnitName(user != null ? user.getUnitname() : "");
-                cUser.setEmail(user != null ? user.getEmail() : "");
-                cUser.setPosition(user != null ? user.getPosition() : "");
-                cUser.setInvite(true);
-            }
-            clubUsers.add(cUser);
+            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")));
+                User user = userMap.get(item.getString("userId"));
+                if (fetch != null) {
+                    cUser = fetch;
+                    cUser.setUserid(item.getString("userId"));
+                    cUser.setSf(item.getInt("sf"));
+                } else {
+                    cUser.setClubid(club.getId());
+                    cUser.setUserid(item.getString("userId"));
+                    cUser.setJoin_time(DateUtil.getDateTime());
+                    cUser.setSf(item.getInt("sf"));
+                    cUser.setIsjf(true);
+                    cUser.setStatus(5);
+                    cUser.setGiveMoney(true);
+                    cUser.setIsNormal(true);
+                    cUser.setMobile(user != null ? user.getMobile() : "");
+                    cUser.setUnitName(user != null ? user.getUnitname() : "");
+                    cUser.setEmail(user != null ? user.getEmail() : "");
+                    cUser.setPosition(user != null ? user.getPosition() : "");
+                    cUser.setInvite(true);
+                }
+                clubUsers.add(cUser);
 
-            //如果是管理员创建的协会，直接加角色
-            if(ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly") && Objects.equals(club.getState(), ClubRegistAuditState.SCHOOL_PASS)) {
-                Sys_user_role uRole = new Sys_user_role();
-                uRole.setUserId(item.getString("userId"));
-                uRole.setRoleId(getRoleId(item.getInt("sf")));
-                uRole.setStid(club.getId());
-                userRoles.add(uRole);
+                //如果是管理员创建的协会，直接加角色
+                if(ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly") && Objects.equals(club.getState(), ClubRegistAuditState.SCHOOL_PASS)) {
+                    Sys_user_role uRole = new Sys_user_role();
+                    uRole.setUserId(item.getString("userId"));
+                    uRole.setRoleId(getRoleId(item.getInt("sf")));
+                    uRole.setStid(club.getId());
+                    userRoles.add(uRole);
+                }
             }
         });
 
diff --git a/src/main/java/io/v/nutz/web/commons/controller/ViCommonCon.java b/src/main/java/io/v/nutz/web/commons/controller/ViCommonCon.java
index cc32aba..84ad6e1 100644
--- a/src/main/java/io/v/nutz/web/commons/controller/ViCommonCon.java
+++ b/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);
     }
diff --git a/src/main/resources/views/platform/sys/club/regist/clubRegistApply.html b/src/main/resources/views/platform/sys/club/regist/clubRegistApply.html
index 312a111..a990be4 100644
--- a/src/main/resources/views/platform/sys/club/regist/clubRegistApply.html
+++ b/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
                     }