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)); Map<String, User> userMap = userList.stream().collect(Collectors.toMap(User::getId, o -> o));
managePerson.forEach(item -> { managePerson.forEach(item -> {
Sys_club_user cUser = new Sys_club_user(); if(StrUtil.isNotBlank(item.getString("userId"))) {
Sys_club_user fetch = dao.fetch(Sys_club_user.class, Cnd.where("clubid", "=", club.getId()) Sys_club_user cUser = new Sys_club_user();
.and("userid", "=", item.getString("userId"))); Sys_club_user fetch = dao.fetch(Sys_club_user.class, Cnd.where("clubid", "=", club.getId())
User user = userMap.get(item.getString("userId")); .and("userid", "=", item.getString("userId")));
if (fetch != null) { User user = userMap.get(item.getString("userId"));
cUser = fetch; if (fetch != null) {
cUser.setUserid(item.getString("userId")); cUser = fetch;
cUser.setSf(item.getInt("sf")); cUser.setUserid(item.getString("userId"));
} else { cUser.setSf(item.getInt("sf"));
cUser.setClubid(club.getId()); } else {
cUser.setUserid(item.getString("userId")); cUser.setClubid(club.getId());
cUser.setJoin_time(DateUtil.getDateTime()); cUser.setUserid(item.getString("userId"));
cUser.setSf(item.getInt("sf")); cUser.setJoin_time(DateUtil.getDateTime());
cUser.setIsjf(true); cUser.setSf(item.getInt("sf"));
cUser.setStatus(5); cUser.setIsjf(true);
cUser.setGiveMoney(true); cUser.setStatus(5);
cUser.setIsNormal(true); cUser.setGiveMoney(true);
cUser.setMobile(user != null ? user.getMobile() : ""); cUser.setIsNormal(true);
cUser.setUnitName(user != null ? user.getUnitname() : ""); cUser.setMobile(user != null ? user.getMobile() : "");
cUser.setEmail(user != null ? user.getEmail() : ""); cUser.setUnitName(user != null ? user.getUnitname() : "");
cUser.setPosition(user != null ? user.getPosition() : ""); cUser.setEmail(user != null ? user.getEmail() : "");
cUser.setInvite(true); cUser.setPosition(user != null ? user.getPosition() : "");
} cUser.setInvite(true);
clubUsers.add(cUser); }
clubUsers.add(cUser);
//如果是管理员创建的协会，直接加角色 //如果是管理员创建的协会，直接加角色
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)) {
Sys_user_role uRole = new Sys_user_role(); Sys_user_role uRole = new Sys_user_role();
uRole.setUserId(item.getString("userId")); uRole.setUserId(item.getString("userId"));
uRole.setRoleId(getRoleId(item.getInt("sf"))); uRole.setRoleId(getRoleId(item.getInt("sf")));
uRole.setStid(club.getId()); uRole.setStid(club.getId());
userRoles.add(uRole); 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 @At
@ViReturn @ViReturn
public Object queryUserByIds(String[] ids) { 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); sql.setParam("id", ids);
return sysUserService.listMap(sql); return sysUserService.listMap(sql);
} }
src/main/resources/views/platform/sys/club/regist/clubRegistApply.html
+2 -9
View File
@@ -332,7 +332,7 @@ layout("/layouts/platform.html"){
</el-table-column> </el-table-column>
<el-table-column> <el-table-column>
<template slot="header" slot-scope="scope"> <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>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="danger" <el-button type="danger"
@@ -670,14 +670,7 @@ layout("/layouts/platform.html"){
this.$message.warning('理事机构成员要求不少于3人') this.$message.warning('理事机构成员要求不少于3人')
return return
}*/ }*/
let clubUserValid = false if (!flag && this.clubUserTableData.length < 20) {
this.managePerson.forEach(item => {
if(!item.userId) {
clubUserValid = true
return
}
})
if (!flag && (this.clubUserTableData.length < 20 || clubUserValid)) {
this.$message.warning('请至少选择20位协会成员') this.$message.warning('请至少选择20位协会成员')
return return
} }