模板Pojo 调整

模板 枚举 添加
添加枚举接口

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java

@@ -137,6 +137,8 @@ public class PersonnelController  extends CoreBaseController {
             personnelService.checkSysUserPassword(model.getUserLoginPassword());
             personnelService.checkSysUserOnly(user);
 
+            SysUserInfo userInfo = personnelService.getSysUserInfoById(info.getId());
+
             SysDepartment infoDepartment = personnelService.getSysDepartmentById(Long.parseLong(model.getInfoDepartmentId()));
             if(infoDepartment == null){
                 ValidatorBean.checkNotNull(infoDepartment,"用户主部门不存在");
@@ -153,13 +155,35 @@ public class PersonnelController  extends CoreBaseController {
             }
             SysOrganize userOrganize = personnelService.getSysOrganizeById(userDepartment.getOrganizeId());
 
-            info.setDepartmentId(infoDepartment.getId());
-            info.setDepartmentNameRdd(infoDepartment.getName());
-            info.setOrganizeId(infoOrganize.getId());
-            info.setOrganizeNameRdd(infoOrganize.getName());
-            info.setOrganizeCode(infoOrganize.getOrganizeCode());
-            info.setPositionId(position.getId());
-            info.setPositionNameRdd(position.getName());
+            userInfo.setDepartmentId(infoDepartment.getId());
+            userInfo.setDepartmentNameRdd(infoDepartment.getName());
+            userInfo.setOrganizeId(infoOrganize.getId());
+            userInfo.setOrganizeNameRdd(infoOrganize.getName());
+            userInfo.setOrganizeCode(infoOrganize.getOrganizeCode());
+            userInfo.setPositionId(position.getId());
+            userInfo.setPositionNameRdd(position.getName());
+            userInfo.setName(info.getName());
+            userInfo.setUserEmpNo(info.getUserEmpNo());
+            userInfo.setUserJoinDate(info.getUserJoinDate());
+            userInfo.setUserResignationDate(info.getUserResignationDate());
+            userInfo.setUserCardType(info.getUserCardType());
+            userInfo.setUserCardNumber(info.getUserCardNumber());
+            userInfo.setUserSchool(info.getUserSchool());
+            userInfo.setUserSchoolProfession(info.getUserSchoolProfession());
+            userInfo.setUserSchoolLeaveDate(info.getUserSchoolLeaveDate());
+            userInfo.setUserSchoolEducation(info.getUserSchoolEducation());
+            userInfo.setUserSex(info.getUserSex());
+            userInfo.setUserBirthplace(info.getUserBirthplace());
+            userInfo.setUserRace(info.getUserRace());
+            userInfo.setUserMarriage(info.getUserMarriage());
+            userInfo.setUserEmergencyContact(info.getUserEmergencyContact());
+            userInfo.setUserEmergencyPhone(info.getUserEmergencyPhone());
+            userInfo.setUserFamilyAddress(info.getUserFamilyAddress());
+            userInfo.setUserBornDate(info.getUserBornDate());
+            userInfo.setUserHobby(info.getUserHobby());
+            userInfo.setUserPoliticalStatus(info.getUserPoliticalStatus());
+            userInfo.setUserGrade(info.getUserGrade());
+            userInfo.setUserEmployeeType(info.getUserEmployeeType());
 
             user.setDepartmentId(userDepartment.getId());
             user.setDepartmentNameRdd(userDepartment.getName());
@@ -167,7 +191,7 @@ public class PersonnelController  extends CoreBaseController {
             user.setOrganizeNameRdd(userOrganize.getName());
 
             // 关系 刷新
-            refreshRef(user, info, model);
+            refreshRef(user, userInfo, model);
             // 更新 密码
             refreshSysUserPassword(user);