diff --git a/src/main/resources/views/platform/sys/data/user/update.html b/src/main/resources/views/platform/sys/data/user/update.html
index 3f70f2c..b6ac48b 100644
--- a/src/main/resources/views/platform/sys/data/user/update.html
+++ b/src/main/resources/views/platform/sys/data/user/update.html
@@ -74,7 +74,7 @@ layout("/layouts/platform.html"){
-
+
diff --git a/src/test/java/com/budwk/app/WelfareTest.java b/src/test/java/com/budwk/app/WelfareTest.java
index a8bbf65..b74b5f9 100644
--- a/src/test/java/com/budwk/app/WelfareTest.java
+++ b/src/test/java/com/budwk/app/WelfareTest.java
@@ -237,14 +237,15 @@ public class WelfareTest {
w.setWelfareUnitName(loginNameMap.get(w.getUserId()).getString("unitName"));
w.setWelfareUnionId(loginNameMap.get(w.getUserId()).getString("unionId"));
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 userSelections = dao.query(WelfareUserSelection.class, Cnd.NEW());
- for (WelfareUserSelection w : userSelections) {
- w.setMobile(loginNameMap.get(w.getSelectUserId()).getString("mobile"));
- }
- dao.update(userSelections, "mobile");
+// List userSelections = dao.query(WelfareUserSelection.class, Cnd.NEW());
+// for (WelfareUserSelection w : userSelections) {
+// w.setMobile(loginNameMap.get(w.getSelectUserId()).getString("mobile"));
+// }
+// dao.update(userSelections, "mobile");
}
@@ -287,24 +288,24 @@ public class WelfareTest {
@Test
public void setMember() {
-// List list = dao.query(Sys_user.class, Cnd.where("loginname", "!=", "superadmin").and("userState","=","在岗"));
-// for (Sys_user user : list) {
-// user.setMember(true);
-// }
-// dao.update(list, "member");
+ List list = dao.query(Sys_user.class, Cnd.where("loginname", "!=", "superadmin").and("userState","=","在岗"));
+ for (Sys_user user : list) {
+ user.setMember(true);
+ }
+ dao.update(list, "member");
- List list = dao.query(Sys_user.class, Cnd.where(Sys_user::getMember, "=", 1));
+ List 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"));
- List list1 = list.stream().map(v -> {
+ List list2 = list1.stream().map(v -> {
Sys_user_role sysUserRole = new Sys_user_role();
sysUserRole.setRoleId("6d603b652abee584ba6274dc1fcee3bb");
sysUserRole.setUserId(v.getId());
return sysUserRole;
}).toList();
- dao.insert(list1);
+ dao.insert(list2);
}