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 676e13c..1fc1cfa 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 @@ -75,7 +75,7 @@ public class ClubRegistApplyController { @Param(value = "isSave", required = false) Boolean isSave, @Param(value = "::managePerson", required = false) List managePerson, @Param(value = "::clubUserList", required = false) List clubUserList) throws IOException { - if(!sysClubService.getInviteAgree(club)) { + if(!isSave && !sysClubService.getInviteAgree(club)) { return Result.error("邀请会员中确认人数暂未达到20人"); } club.setIsjs(false); @@ -124,21 +124,23 @@ public class ClubRegistApplyController { //协会成员 List manageUserIdList = managePerson.stream().map(o -> o.getString("userId")).toList(); - clubUserList.forEach(item -> { - if (StrUtil.isNotBlank(item.getString("userId")) && !manageUserIdList.contains(item.getString("userId"))) { - Sys_club_user cUser = new Sys_club_user(); - cUser.setClubid(sysClub.getId()); - cUser.setUserid(item.getString("userId")); - cUser.setJoin_time(DateUtil.getDateTime()); - cUser.setSf(2); - cUser.setIsjf(true); - cUser.setStatus(6); - cUser.setGiveMoney(true); - cUser.setIsNormal(true); - cUser.setInvite(true); - clubUsers.add(cUser); - } - }); + if(Lang.isNotEmpty(clubUserList)) { + clubUserList.forEach(item -> { + if (StrUtil.isNotBlank(item.getString("userId")) && !manageUserIdList.contains(item.getString("userId"))) { + Sys_club_user cUser = new Sys_club_user(); + cUser.setClubid(sysClub.getId()); + cUser.setUserid(item.getString("userId")); + cUser.setJoin_time(DateUtil.getDateTime()); + cUser.setSf(2); + cUser.setIsjf(true); + cUser.setStatus(6); + cUser.setGiveMoney(true); + cUser.setIsNormal(true); + cUser.setInvite(true); + clubUsers.add(cUser); + } + }); + } if (ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) { dao.insert(userRoles); @@ -224,25 +226,27 @@ public class ClubRegistApplyController { }); List manageUserIdList = managePerson.stream().map(o -> o.getString("userId")).toList(); - clubUserList.forEach(item -> { - 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"))); - if(count == 0) { - Sys_club_user cUser = new Sys_club_user(); - cUser.setClubid(club.getId()); - cUser.setUserid(item.getString("userId")); - cUser.setJoin_time(DateUtil.getDateTime()); - cUser.setSf(2); - cUser.setIsjf(true); - cUser.setStatus(6); - cUser.setGiveMoney(true); - cUser.setIsNormal(true); - cUser.setInvite(true); - clubUsers.add(cUser); + if(Lang.isNotEmpty(clubUserList)) { + clubUserList.forEach(item -> { + 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"))); + if(count == 0) { + Sys_club_user cUser = new Sys_club_user(); + cUser.setClubid(club.getId()); + cUser.setUserid(item.getString("userId")); + cUser.setJoin_time(DateUtil.getDateTime()); + cUser.setSf(2); + cUser.setIsjf(true); + cUser.setStatus(6); + cUser.setGiveMoney(true); + cUser.setIsNormal(true); + cUser.setInvite(true); + clubUsers.add(cUser); + } } - } - }); + }); + } if(ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly") && Objects.equals(club.getState(), ClubRegistAuditState.SCHOOL_PASS)) { dao.clear(Sys_user_role.class, Cnd.where("stid", "=", club.getId())