Merge remote-tracking branch 'origin/master'

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxInsideInspectionServiceImpl.java

@@ -550,10 +550,10 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
         List<String> insideIdList = new ArrayList<>();
         Map<String, String> descMap = new HashMap<>();
         for (ZhcxInsideInspectionVo vo: list) {
-            vo.setSupervision(vo.getSupervision().replace("'", ""));
-            vo.setInspectioncode(vo.getInspectioncode().replace("'", ""));
-            vo.setInspectionstatus(vo.getInspectionstatus().replace("'", ""));
-            vo.setSupervisionphone(vo.getSupervisionphone().replace("'", ""));
+            vo.setSupervision("NULL".equals(vo.getSupervision().replace("'", "")) ? "":vo.getSupervision().replace("'", ""));
+            vo.setInspectioncode("NULL".equals(vo.getInspectioncode().replace("'", "")) ? "":vo.getInspectioncode().replace("'", ""));
+            vo.setInspectionstatus("NULL".equals(vo.getInspectionstatus().replace("'", "")) ? "":vo.getInspectionstatus().replace("'", ""));
+            vo.setSupervisionphone("NULL".equals(vo.getSupervisionphone().replace("'", "")) ? "":vo.getSupervisionphone().replace("'", ""));
             if (ObjectUtil.isNull(vo.getInspectioncode()) || "NULL".equals(vo.getInspectioncode())) {
                 continue;
             }
@@ -564,7 +564,8 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
             req.setDispatchFlag(2);
             SysUserDo sysUserDo = userMap.get(vo.getSupervision());
             if (!ObjectUtil.isNull(sysUserDo)) {
-                if(inOper.getDispatch().getSupervisionid().equals(sysUserDo.getId())) {
+                String supervisionid = inOper.getDispatch().getSupervisionid();
+                if(StringUtils.isNotBlank(supervisionid) && supervisionid.equals(sysUserDo.getId())) {
                     continue;
                 }
                 ZhcxInsideInspectionDo inspectionDo = map.get(sysUserDo.getId() + "gp");