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-09 13:54:04 +08:00
parent f99ebdfff6
commit d94a12e0ca
3 changed files with 36 additions and 41 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
+33 -31
View File
@@ -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);
}
}
});
src/main/java/io/v/nutz/web/commons/controller/ViCommonCon.java
+1 -1
View File
@@ -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);
}