diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceLeaveRecordController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceLeaveRecordController.java index 96647ede65d175c3e0a713ed74edadf21f4e49de..b46c62041e17167eabac2c00853861537a5ce6bc 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceLeaveRecordController.java +++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceLeaveRecordController.java @@ -43,10 +43,10 @@ public class AttendanceLeaveRecordController extends BaseCRUDJsonBodyMappingCont private DeptService deptService; @Autowired private WorkmanService workmanService; -// @Autowired -// private UserService userService; @Autowired - private IUserFeign iUserFeign; + private UserService userService; +// @Autowired +// private IUserFeign iUserFeign; public AttendanceLeaveRecordController(){ super.setModuleDesc( "璇峰亣璁板綍淇℃伅"); @@ -59,20 +59,20 @@ public class AttendanceLeaveRecordController extends BaseCRUDJsonBodyMappingCont this.addDict(model, "leaveType", paramService.getParamBySecondOrganize("AttendanceLeaveRecord","leaveType")); this.addDict(model, "auditResult", AppealResultEnum.getEnumMap()); this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap()); -// this.addDict(model, "createUserId", userService.find(new UserQuery()).stream().collect(toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n))); - - //浠庨棬鎴疯幏鍙栫櫥褰曠敤鎴蜂俊鎭� - UserPdu userPdu = new UserPdu(); - userPdu.setSize(-1); - List <UserPdu> userPduList = iUserFeign.list(userPdu).getData().getData(); - Map<String, String> ans = new HashMap<>(); - for(UserPdu str: userPduList) { - if(str != null) { //澧炲姞闈炵┖鍒ゆ柇 - ans.put(str.getId().toString(), str.getRealName()); - } - } + this.addDict(model, "createUserId", userService.find(new UserQuery()).stream().collect(toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n))); - this.addDict(model, "createUserId", ans); +// //浠庨棬鎴疯幏鍙栫櫥褰曠敤鎴蜂俊鎭� +// UserPdu userPdu = new UserPdu(); +// userPdu.setSize(-1); +// List <UserPdu> userPduList = iUserFeign.list(userPdu).getData().getData(); +// Map<String, String> ans = new HashMap<>(); +// for(UserPdu str: userPduList) { +// if(str != null) { //澧炲姞闈炵┖鍒ゆ柇 +// ans.put(str.getId().toString(), str.getRealName()); +// } +// } +// +// this.addDict(model, "createUserId", ans); super.init(model, context);