diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyAuditController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyAuditController.java index ab0b200..773e6bb 100644 --- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyAuditController.java +++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/applyIn/ClubApplyAuditController.java @@ -133,6 +133,7 @@ public class ClubApplyAuditController { cnd.and("sf", "=", 2); cnd.and("isNormal", "=", true); + cnd.and("club.state", "=", ClubRegistAuditState.SCHOOL_PASS); cnd.andEX("scu.clubid", "=", clubid); cnd.andEX("u.personType", "=", personType); cnd.andEX("u.userState", "=", userState); 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 1fc1cfa..8b0b92c 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 @@ -27,6 +27,7 @@ import org.nutz.mvc.annotation.Param; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; @@ -96,10 +97,14 @@ public class ClubRegistApplyController { //插入新建协会时填入的理事机构 List clubUsers = new ArrayList<>(); - List userRoles = new ArrayList<>(); + + List userList = dao.query(User.class, Cnd.NEW()); + Map userMap = userList.stream().collect(Collectors.toMap(User::getId, o -> o)); + managePerson.forEach(item -> { if (StrUtil.isNotBlank(item.getString("userId"))) { + User user = userMap.get(item.getString("userId")); Sys_club_user cUser = new Sys_club_user(); cUser.setClubid(sysClub.getId()); cUser.setUserid(item.getString("userId")); @@ -109,6 +114,10 @@ public class ClubRegistApplyController { 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() : ""); clubUsers.add(cUser); //如果是管理员创建的协会,直接加角色 @@ -127,6 +136,7 @@ public class ClubRegistApplyController { if(Lang.isNotEmpty(clubUserList)) { clubUserList.forEach(item -> { if (StrUtil.isNotBlank(item.getString("userId")) && !manageUserIdList.contains(item.getString("userId"))) { + User user = userMap.get(item.getString("userId")); Sys_club_user cUser = new Sys_club_user(); cUser.setClubid(sysClub.getId()); cUser.setUserid(item.getString("userId")); @@ -137,6 +147,10 @@ public class ClubRegistApplyController { cUser.setGiveMoney(true); cUser.setIsNormal(true); cUser.setInvite(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() : ""); clubUsers.add(cUser); } }); @@ -195,10 +209,15 @@ public class ClubRegistApplyController { List clubUsers = new ArrayList<>(); List userRoles = new ArrayList<>(); + + List userList = dao.query(User.class, Cnd.NEW()); + Map 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")); @@ -212,6 +231,10 @@ public class ClubRegistApplyController { 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() : ""); } clubUsers.add(cUser); @@ -231,6 +254,7 @@ public class ClubRegistApplyController { if (StrUtil.isNotBlank(item.getString("userId")) && !manageUserIdList.contains(item.getString("userId"))) { int count = dao.count(Sys_club_user.class, Cnd.where("clubid", "=", club.getId()) .and("userid", "=", item.getString("userId"))); + User user = userMap.get(item.getString("userId")); if(count == 0) { Sys_club_user cUser = new Sys_club_user(); cUser.setClubid(club.getId()); @@ -242,6 +266,10 @@ public class ClubRegistApplyController { cUser.setGiveMoney(true); cUser.setIsNormal(true); cUser.setInvite(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() : ""); clubUsers.add(cUser); } }