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

1

Browse Source
This commit is contained in:
c-zhangr1
2026-07-08 09:26:27 +08:00
parent 34627245ac
commit 1a64de529e
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/dayofficework/honor/controller/HonorBasicSettingsController.java
+1 -1
View File
@@ -85,7 +85,7 @@ public class HonorBasicSettingsController {
} else {
dao.updateIgnoreNull(honorBasicSettings);
}
dao.update(Chain.make("hasChildren", true), Cnd.where("id", "=", honorBasicSettings.getParentId()));
dao.update(HonorBasicSettings.class, Chain.make("hasChildren", true), Cnd.where("id", "=", honorBasicSettings.getParentId()));
return Result.success();
} catch (Exception e) {
return Result.error();
src/main/java/com/budwk/app/zhgh/dayofficework/honor/controller/HonorBatchController.java
+9 -1
View File
@@ -103,7 +103,11 @@ public class HonorBatchController {
u.unionId,
u.unionName,
u.unitId,
u.unitName
u.unitName,
u.sex,
u.birthday,
u.userState,
u.political
FROM
`vw_user` u
""");
@@ -127,6 +131,10 @@ public class HonorBatchController {
user.ifPresent(sysUser -> v.setUnitId(sysUser.getString("unitId")));
user.ifPresent(sysUser -> v.setUnitName(sysUser.getString("unitName")));
user.ifPresent(sysUser -> v.setUserId(sysUser.getString("id")));
user.ifPresent(sysUser -> v.setUserSex(sysUser.getString("sex")));
user.ifPresent(sysUser -> v.setBirthday(sysUser.getString("birthday")));
user.ifPresent(sysUser -> v.setJobStatus(sysUser.getString("userState")));
user.ifPresent(sysUser -> v.setPolitical(sysUser.getString("political")));
} else {
v.setHonorType(getBasicIdByName("集体荣誉"));
//设置分工会