c-zhouhf1/zhgh_hmc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
@jyuhsin
2025-01-03 09:51:56 +08:00
parent 007b1ef59f
commit b1a7ab2162
1 changed files with 38 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubRegistApplyController.java
+5 -1
View File
@@ -75,7 +75,7 @@ public class ClubRegistApplyController {
@Param(value = "isSave", required = false) Boolean isSave, @Param(value = "isSave", required = false) Boolean isSave,
@Param(value = "::managePerson", required = false) List<NutMap> managePerson, @Param(value = "::managePerson", required = false) List<NutMap> managePerson,
@Param(value = "::clubUserList", required = false) List<NutMap> clubUserList) throws IOException { @Param(value = "::clubUserList", required = false) List<NutMap> clubUserList) throws IOException {
if(!sysClubService.getInviteAgree(club)) { if(!isSave && !sysClubService.getInviteAgree(club)) {
return Result.error("邀请会员中确认人数暂未达到20人"); return Result.error("邀请会员中确认人数暂未达到20人");
} }
club.setIsjs(false); club.setIsjs(false);
@@ -124,6 +124,7 @@ public class ClubRegistApplyController {
//协会成员 //协会成员
List<String> manageUserIdList = managePerson.stream().map(o -> o.getString("userId")).toList(); List<String> manageUserIdList = managePerson.stream().map(o -> o.getString("userId")).toList();
if(Lang.isNotEmpty(clubUserList)) {
clubUserList.forEach(item -> { clubUserList.forEach(item -> {
if (StrUtil.isNotBlank(item.getString("userId")) && !manageUserIdList.contains(item.getString("userId"))) { if (StrUtil.isNotBlank(item.getString("userId")) && !manageUserIdList.contains(item.getString("userId"))) {
Sys_club_user cUser = new Sys_club_user(); Sys_club_user cUser = new Sys_club_user();
@@ -139,6 +140,7 @@ public class ClubRegistApplyController {
clubUsers.add(cUser); clubUsers.add(cUser);
} }
}); });
}
if (ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) { if (ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly")) {
dao.insert(userRoles); dao.insert(userRoles);
@@ -224,6 +226,7 @@ public class ClubRegistApplyController {
}); });
List<String> manageUserIdList = managePerson.stream().map(o -> o.getString("userId")).toList(); List<String> manageUserIdList = managePerson.stream().map(o -> o.getString("userId")).toList();
if(Lang.isNotEmpty(clubUserList)) {
clubUserList.forEach(item -> { clubUserList.forEach(item -> {
if (StrUtil.isNotBlank(item.getString("userId")) && !manageUserIdList.contains(item.getString("userId"))) { if (StrUtil.isNotBlank(item.getString("userId")) && !manageUserIdList.contains(item.getString("userId"))) {
int count = dao.count(Sys_club_user.class, Cnd.where("clubid", "=", club.getId()) int count = dao.count(Sys_club_user.class, Cnd.where("clubid", "=", club.getId())
@@ -243,6 +246,7 @@ public class ClubRegistApplyController {
} }
} }
}); });
}
if(ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly") && Objects.equals(club.getState(), ClubRegistAuditState.SCHOOL_PASS)) { if(ShiroUtil.hasAnyRoles("sysadmin, A06, xxhgly") && Objects.equals(club.getState(), ClubRegistAuditState.SCHOOL_PASS)) {
dao.clear(Sys_user_role.class, Cnd.where("stid", "=", club.getId()) dao.clear(Sys_user_role.class, Cnd.where("stid", "=", club.getId())