审核审批人

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorderitemreport/BoilerTaskOrderItemReportServiceImpl.java

@@ -674,12 +674,19 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
                         }
                     }
                 }else {
-                    List<AdminUserRespDTO> userListByNickname = adminUserApi.getUserListByNickname(approval.getUserName()).getCheckedData();
-                    if (!userListByNickname.isEmpty()) {
-                        AdminUserRespDTO approvalUser = userListByNickname.get(0);
-                        approvalId = approvalUser.getId();
-                        approvalName = approvalUser.getNickname();
+                    AdminUserRespDTO userRespDTO = adminUserApi.getUserByEmployeeNo(approval.getUserName()).getCheckedData();
+                    if (userRespDTO != null) {
+                        approvalId = userRespDTO.getId();
+                        approvalName = userRespDTO.getNickname();
                         approvalTime = approval.getCreateDate();
+                    } else {
+                        List<AdminUserRespDTO> userListByNickname = adminUserApi.getUserListByNickname(approval.getUserName()).getCheckedData();
+                        if (!userListByNickname.isEmpty()) {
+                            AdminUserRespDTO approvalUser = userListByNickname.get(0);
+                            approvalId = approvalUser.getId();
+                            approvalName = approvalUser.getNickname();
+                            approvalTime = approval.getCreateDate();
+                        }
                     }
                 }
             }
@@ -701,12 +708,19 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
                         }
                     }
                 }else {
-                    List<AdminUserRespDTO> userListByNickname = adminUserApi.getUserListByNickname(ratify.getUserName()).getCheckedData();
-                    if (!userListByNickname.isEmpty()) {
-                        AdminUserRespDTO ratifyUser = userListByNickname.get(0);
-                        ratifyId = ratifyUser.getId();
-                        ratifyName = ratifyUser.getNickname();
-                        ratifyTime = ratify.getCreateDate();
+                    AdminUserRespDTO userRespDTO = adminUserApi.getUserByEmployeeNo(approval.getUserName()).getCheckedData();
+                    if (userRespDTO != null) {
+                        approvalId = userRespDTO.getId();
+                        approvalName = userRespDTO.getNickname();
+                        approvalTime = approval.getCreateDate();
+                    } else {
+                        List<AdminUserRespDTO> userListByNickname = adminUserApi.getUserListByNickname(ratify.getUserName()).getCheckedData();
+                        if (!userListByNickname.isEmpty()) {
+                            AdminUserRespDTO ratifyUser = userListByNickname.get(0);
+                            ratifyId = ratifyUser.getId();
+                            ratifyName = ratifyUser.getNickname();
+                            ratifyTime = ratify.getCreateDate();
+                        }
                     }
                 }
             }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderitemreport/PipeTaskOrderItemReportServiceImpl.java

@@ -581,12 +581,19 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
                         }
                     }
                 } else {
-                    List<AdminUserRespDTO> userListByNickname = adminUserApi.getUserListByNickname(approval.getUserName()).getCheckedData();
-                    if (!userListByNickname.isEmpty()) {
-                        AdminUserRespDTO approvalUser = userListByNickname.get(0);
-                        approvalId = approvalUser.getId();
-                        approvalName = approvalUser.getNickname();
+                    AdminUserRespDTO userRespDTO = adminUserApi.getUserByEmployeeNo(approval.getUserName()).getCheckedData();
+                    if (userRespDTO != null) {
+                        approvalId = userRespDTO.getId();
+                        approvalName = userRespDTO.getNickname();
                         approvalTime = approval.getCreateDate();
+                    } else {
+                        List<AdminUserRespDTO> userListByNickname = adminUserApi.getUserListByNickname(approval.getUserName()).getCheckedData();
+                        if (!userListByNickname.isEmpty()) {
+                            AdminUserRespDTO approvalUser = userListByNickname.get(0);
+                            approvalId = approvalUser.getId();
+                            approvalName = approvalUser.getNickname();
+                            approvalTime = approval.getCreateDate();
+                        }
                     }
                 }
             }
@@ -608,12 +615,19 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
                         }
                     }
                 } else {
-                    List<AdminUserRespDTO> userListByNickname = adminUserApi.getUserListByNickname(ratify.getUserName()).getCheckedData();
-                    if (!userListByNickname.isEmpty()) {
-                        AdminUserRespDTO ratifyUser = userListByNickname.get(0);
-                        ratifyId = ratifyUser.getId();
-                        ratifyName = ratifyUser.getNickname();
+                    AdminUserRespDTO userRespDTO = adminUserApi.getUserByEmployeeNo(ratify.getUserName()).getCheckedData();
+                    if (userRespDTO != null) {
+                        ratifyId = userRespDTO.getId();
+                        ratifyName = userRespDTO.getNickname();
                         ratifyTime = ratify.getCreateDate();
+                    } else {
+                        List<AdminUserRespDTO> userListByNickname = adminUserApi.getUserListByNickname(ratify.getUserName()).getCheckedData();
+                        if (!userListByNickname.isEmpty()) {
+                            AdminUserRespDTO ratifyUser = userListByNickname.get(0);
+                            ratifyId = ratifyUser.getId();
+                            ratifyName = ratifyUser.getNickname();
+                            ratifyTime = ratify.getCreateDate();
+                        }
                     }
                 }
             }