chenshudong hace 1 mes
padre
commit
d3ed6a343b

+ 3 - 3
airport-personnel/src/main/java/com/sundot/airport/personnel/service/impl/PersonnelNonCadreMonthlyAssessmentServiceImpl.java

@@ -984,7 +984,7 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
984
             List<SysUser> teamLeaderList = sysUserService.selectUserLeaderListByCondition(teamLeaderDto);
984
             List<SysUser> teamLeaderList = sysUserService.selectUserLeaderListByCondition(teamLeaderDto);
985
             if (CollUtil.isNotEmpty(teamLeaderList)) {
985
             if (CollUtil.isNotEmpty(teamLeaderList)) {
986
                 personnelNonCadreMonthlyAssessmentNew.setDeputyTeamLeaderId(teamLeaderList.get(0).getUserId());
986
                 personnelNonCadreMonthlyAssessmentNew.setDeputyTeamLeaderId(teamLeaderList.get(0).getUserId());
987
-                personnelNonCadreMonthlyAssessmentNew.setDeputyTeamLeaderName(teamLeaderList.get(0).getUserName());
987
+                personnelNonCadreMonthlyAssessmentNew.setDeputyTeamLeaderName(teamLeaderList.get(0).getNickName());
988
             }
988
             }
989
             SysUserLeaderConditionDto supervisorDto = new SysUserLeaderConditionDto();
989
             SysUserLeaderConditionDto supervisorDto = new SysUserLeaderConditionDto();
990
             supervisorDto.setUserId(sysUser.getUserId());
990
             supervisorDto.setUserId(sysUser.getUserId());
@@ -992,7 +992,7 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
992
             List<SysUser> supervisorList = sysUserService.selectUserLeaderListByCondition(supervisorDto);
992
             List<SysUser> supervisorList = sysUserService.selectUserLeaderListByCondition(supervisorDto);
993
             if (CollUtil.isNotEmpty(supervisorList)) {
993
             if (CollUtil.isNotEmpty(supervisorList)) {
994
                 personnelNonCadreMonthlyAssessmentNew.setDeputySupervisorId(supervisorList.get(0).getUserId());
994
                 personnelNonCadreMonthlyAssessmentNew.setDeputySupervisorId(supervisorList.get(0).getUserId());
995
-                personnelNonCadreMonthlyAssessmentNew.setDeputySupervisorName(supervisorList.get(0).getUserName());
995
+                personnelNonCadreMonthlyAssessmentNew.setDeputySupervisorName(supervisorList.get(0).getNickName());
996
             }
996
             }
997
             SysUserLeaderConditionDto managerDto = new SysUserLeaderConditionDto();
997
             SysUserLeaderConditionDto managerDto = new SysUserLeaderConditionDto();
998
             managerDto.setUserId(sysUser.getUserId());
998
             managerDto.setUserId(sysUser.getUserId());
@@ -1004,7 +1004,7 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
1004
                 }
1004
                 }
1005
                 if (CollUtil.isNotEmpty(managerList)) {
1005
                 if (CollUtil.isNotEmpty(managerList)) {
1006
                     personnelNonCadreMonthlyAssessmentNew.setDeputyManagerId(managerList.get(0).getUserId());
1006
                     personnelNonCadreMonthlyAssessmentNew.setDeputyManagerId(managerList.get(0).getUserId());
1007
-                    personnelNonCadreMonthlyAssessmentNew.setDeputyManagerName(managerList.get(0).getUserName());
1007
+                    personnelNonCadreMonthlyAssessmentNew.setDeputyManagerName(managerList.get(0).getNickName());
1008
                 }
1008
                 }
1009
             }
1009
             }
1010
             personnelNonCadreMonthlyAssessmentNew.setPersonnelMonthlyAssessmentIndicatorDetailList(new ArrayList<>());
1010
             personnelNonCadreMonthlyAssessmentNew.setPersonnelMonthlyAssessmentIndicatorDetailList(new ArrayList<>());