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

..

Browse Source
This commit is contained in:
server
2025-06-23 14:21:04 +08:00
parent cc008b2722
commit 35f234a674
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/sys/data/user/update.html
+1 -1
View File
@@ -74,7 +74,7 @@ layout("/layouts/platform.html"){
<el-table-column prop="personType" label="人员类型" sortable width="120"></el-table-column> <el-table-column prop="personType" label="人员类型" sortable width="120"></el-table-column>
<el-table-column prop="arrivalAtSchoolDate" label="来校年月" sortable width="120"></el-table-column> <el-table-column prop="arrivalAtSchoolDate" label="来校年月" sortable width="120"></el-table-column>
<el-table-column prop="technicalTitle" label="技术职称" sortable width="120"></el-table-column> <el-table-column prop="technicalTitle" label="技术职称" sortable width="120"></el-table-column>
<el-table-column prop="governmentPosition" label="党政职务" sortable width="120" show-overflow-tooltip></el-table-column> <el-table-column prop="position" label="职务" sortable width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="education" label="学历" show-overflow-tooltip sortable width="120"></el-table-column> <el-table-column prop="education" label="学历" show-overflow-tooltip sortable width="120"></el-table-column>
<el-table-column prop="academicDegree" label="学位" show-overflow-tooltip sortable width="120"></el-table-column> <el-table-column prop="academicDegree" label="学位" show-overflow-tooltip sortable width="120"></el-table-column>
<el-table-column prop="unitName" label="单位" show-overflow-tooltip sortable width="120"></el-table-column> <el-table-column prop="unitName" label="单位" show-overflow-tooltip sortable width="120"></el-table-column>
src/test/java/com/budwk/app/WelfareTest.java
+15 -14
View File
@@ -237,14 +237,15 @@ public class WelfareTest {
w.setWelfareUnitName(loginNameMap.get(w.getUserId()).getString("unitName")); w.setWelfareUnitName(loginNameMap.get(w.getUserId()).getString("unitName"));
w.setWelfareUnionId(loginNameMap.get(w.getUserId()).getString("unionId")); w.setWelfareUnionId(loginNameMap.get(w.getUserId()).getString("unionId"));
w.setWelfareUnionName(loginNameMap.get(w.getUserId()).getString("unionName")); w.setWelfareUnionName(loginNameMap.get(w.getUserId()).getString("unionName"));
w.setPersonType(loginNameMap.get(w.getUserId()).getString("personType"));
} }
dao.update(list, "welfareUnitName|welfareUnionId|welfareUnionName"); dao.update(list, "welfareUnitName|welfareUnionId|welfareUnionName|personType");
List<WelfareUserSelection> userSelections = dao.query(WelfareUserSelection.class, Cnd.NEW()); // List<WelfareUserSelection> userSelections = dao.query(WelfareUserSelection.class, Cnd.NEW());
for (WelfareUserSelection w : userSelections) { // for (WelfareUserSelection w : userSelections) {
w.setMobile(loginNameMap.get(w.getSelectUserId()).getString("mobile")); // w.setMobile(loginNameMap.get(w.getSelectUserId()).getString("mobile"));
} // }
dao.update(userSelections, "mobile"); // dao.update(userSelections, "mobile");
} }
@@ -287,24 +288,24 @@ public class WelfareTest {
@Test @Test
public void setMember() { public void setMember() {
// List<Sys_user> list = dao.query(Sys_user.class, Cnd.where("loginname", "!=", "superadmin").and("userState","=","在岗")); List<Sys_user> list = dao.query(Sys_user.class, Cnd.where("loginname", "!=", "superadmin").and("userState","=","在岗"));
// for (Sys_user user : list) { for (Sys_user user : list) {
// user.setMember(true); user.setMember(true);
// } }
// dao.update(list, "member"); dao.update(list, "member");
List<Sys_user> list = dao.query(Sys_user.class, Cnd.where(Sys_user::getMember, "=", 1)); List<Sys_user> list1 = dao.query(Sys_user.class, Cnd.where(Sys_user::getMember, "=", 1));
dao.clear(Sys_user_role.class, Cnd.where(Sys_user_role::getRoleId, "=", "6d603b652abee584ba6274dc1fcee3bb")); dao.clear(Sys_user_role.class, Cnd.where(Sys_user_role::getRoleId, "=", "6d603b652abee584ba6274dc1fcee3bb"));
List<Sys_user_role> list1 = list.stream().map(v -> { List<Sys_user_role> list2 = list1.stream().map(v -> {
Sys_user_role sysUserRole = new Sys_user_role(); Sys_user_role sysUserRole = new Sys_user_role();
sysUserRole.setRoleId("6d603b652abee584ba6274dc1fcee3bb"); sysUserRole.setRoleId("6d603b652abee584ba6274dc1fcee3bb");
sysUserRole.setUserId(v.getId()); sysUserRole.setUserId(v.getId());
return sysUserRole; return sysUserRole;
}).toList(); }).toList();
dao.insert(list1); dao.insert(list2);
} }