Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

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);