SAI台账列表查询优化

master/src/main/java/com/ruoyi/project/production/service/impl/TSaiApplyServiceImpl.java

@@ -101,7 +101,10 @@ public class TSaiApplyServiceImpl implements ITSaiApplyService
             }
             if (applicant != null) {
 //                saiApply.setApplicantName(sysUserMapper.selectUserById(Long.parseLong(applicant)).getNickName());
-                saiApply.setApplicantName(nameMap.get(Long.parseLong(applicant)));
+                String applicantName = nameMap.get(Long.parseLong(applicant));
+                if (applicantName != null && !"null".equals(applicantName)) {
+                    saiApply.setApplicantName(applicantName);
+                }
             }
             if (handler != null) {
                 if (handler.indexOf(",") != -1) {
@@ -109,20 +112,29 @@ public class TSaiApplyServiceImpl implements ITSaiApplyService
                     String handlerName = "";
                     for (int i = 0; i < split.length; i++) {
 //                        handlerName += sysUserMapper.selectUserById(Long.parseLong(split[i])).getNickName();
-                        handlerName += nameMap.get(Long.parseLong(split[i]));
-                        if (i < split.length - 1) {
-                            handlerName += ",";
+                        String name = nameMap.get(Long.parseLong(split[i]));
+                        if (name != null && !"null".equals(name)) {
+                            handlerName += name;
+                            if (i < split.length - 1) {
+                                handlerName += ",";
+                            }
                         }
                     }
                     saiApply.setHandlerName(handlerName);
                 } else {
 //                    saiApply.setHandlerName(sysUserMapper.selectUserById(Long.parseLong(handler)).getNickName());
-                    saiApply.setHandlerName(nameMap.get(Long.parseLong(handler)));
+                    String handlerName = nameMap.get(Long.parseLong(handler));
+                    if (handlerName != null && !"null".equals(handlerName)) {
+                        saiApply.setHandlerName(handlerName);
+                    }
                 }
             }
             if (executor != null) {
 //                saiApply.setExecutorName(sysUserMapper.selectUserById(Long.parseLong(executor)).getNickName());
-                saiApply.setExecutorName(nameMap.get(Long.parseLong(executor)));
+                String executorName = nameMap.get(Long.parseLong(executor));
+                if (executorName != null && !"null".equals(executorName)) {
+                    saiApply.setExecutorName(executorName);
+                }
             }
         }
         boolean specialRole = this.isSpecialRole();