diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/honor/controller/HonorBasicSettingsController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/honor/controller/HonorBasicSettingsController.java index 9a47ee81..59f4e80e 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/honor/controller/HonorBasicSettingsController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/honor/controller/HonorBasicSettingsController.java @@ -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(); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/honor/controller/HonorBatchController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/honor/controller/HonorBatchController.java index 23951c49..2b757495 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/honor/controller/HonorBatchController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/honor/controller/HonorBatchController.java @@ -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("集体荣誉")); //设置分工会