凌云集团更改公司

whepi-web/src/main/java/com/bofeng/entity/ReturnWorkLy.java

@@ -33,7 +33,7 @@ public class ReturnWorkLy {
     @ExcelProperty(value = "部门", index = 0)
     @TableField(exist = false)
     private String unit;
-    @ExcelProperty(value = "名称", index = 1)
+    @ExcelProperty(value = "姓名", index = 1)
     @TableField(exist = false)
     private String linkman;
     @ExcelProperty(value = "电话", index = 2)

whepi-web/src/main/java/com/bofeng/wx/controller/ScanController.java

@@ -306,7 +306,7 @@ public class ScanController {
                         }
                     }
                     MsReport msReport1 = msReportMapper.msAddr(userOpen.getUserId());
-                    if (msReport1 != null && !msReport1.getWorkMsg().equals(msReport1.getTodayMsg()) && !compareWhere(msReport1.getWorkMsg(), msReport1.getTodayMsg())) {
+                    if (msReport1 != null &&msReport1.getWorkMsg() != null &&msReport1.getTodayMsg() != null && !msReport1.getWorkMsg().equals(msReport1.getTodayMsg()) && !compareWhere(msReport1.getWorkMsg(), msReport1.getTodayMsg())) {
                         model.put("collor", "red");
                         model.put("collor2", "red");
                         model.put("into", "不许进入");
@@ -769,7 +769,7 @@ public class ScanController {
                 }
             }
             MsReport msReport1 = msReportMapper.msAddr(userId);
-            if (msReport1 != null && !msReport1.getWorkMsg().equals(msReport1.getTodayMsg()) && !compareWhere(msReport1.getWorkMsg(), msReport1.getTodayMsg())) {
+            if (msReport1 != null &&msReport1.getWorkMsg() != null &&msReport1.getTodayMsg() != null && !msReport1.getWorkMsg().equals(msReport1.getTodayMsg()) && !compareWhere(msReport1.getWorkMsg(), msReport1.getTodayMsg())) {
                 model.put("collor", "red");
                 model.put("collor2", "red");
                 model.put("into", "不可复工");