From 351f2d131c68535246d86af122c8e1d7e6971d95 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Tue, 22 Aug 2023 18:02:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/zhgd/mybatis/DataScopeHandler.java      | 3 +++
 .../safety/service/impl/ProjectSubItemServiceImpl.java    | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java
index f78e524..91bedcc 100644
--- a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java
+++ b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java
@@ -164,6 +164,9 @@ public class DataScopeHandler implements DataPermissionHandler {
 
     protected void addParam(Insert insert, Object obj){
         SecurityUser user = SecurityUtil.getUser();
+        if (user == null) {
+            return;
+        }
         List<Column> columns = insert.getColumns();
         if (CollectionUtils.isEmpty(columns)) {
             // 针对不给列名的insert 不处理
diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java
index 3903644..9d71f76 100644
--- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java
@@ -163,18 +163,18 @@ public class ProjectSubItemServiceImpl extends ServiceImpl<ProjectSubItemMapper,
             for (ProjectSubItem child : children) {
                 if (child.getState() != 3) {
                     if (child.getRealEndTime() != null) {
-                        child.setSlippage(DateUtil.compare(child.getRealEndTime(), child.getPlanEndTime()) <= 0 ? null : DateUtil.between(child.getRealEndTime(), child.getPlanEndTime(), DateUnit.DAY));
+                        child.setSlippage(DateUtil.between(child.getRealEndTime(), child.getPlanEndTime(), DateUnit.DAY) <= 0 ? null : DateUtil.between(child.getRealEndTime(), child.getPlanEndTime(), DateUnit.DAY));
                     } else {
-                        child.setSlippage(DateUtil.compare(new Date(), child.getPlanEndTime()) <= 0 ? null : DateUtil.between(new Date(), child.getPlanEndTime(), DateUnit.DAY));
+                        child.setSlippage(DateUtil.between(new Date(), child.getPlanEndTime(), DateUnit.DAY) <= 0 ? null : DateUtil.between(new Date(), child.getPlanEndTime(), DateUnit.DAY));
                     }
                 }
             }
             for (ProjectSubItemDto subItem : records) {
                 if (subItem.getState() != 3) {
                     if (subItem.getRealEndTime() != null) {
-                        subItem.setSlippage(DateUtil.compare(subItem.getRealEndTime(), subItem.getPlanEndTime()) <= 0 ? null : DateUtil.between(subItem.getRealEndTime(), subItem.getPlanEndTime(), DateUnit.DAY));
+                        subItem.setSlippage(DateUtil.between(subItem.getRealEndTime(), subItem.getPlanEndTime(), DateUnit.DAY) <= 0 ? null : DateUtil.between(subItem.getRealEndTime(), subItem.getPlanEndTime(), DateUnit.DAY));
                     } else {
-                        subItem.setSlippage(DateUtil.compare(new Date(), subItem.getPlanEndTime()) <= 0 ? null : DateUtil.between(new Date(), subItem.getPlanEndTime(), DateUnit.DAY));
+                        subItem.setSlippage(DateUtil.between(new Date(), subItem.getPlanEndTime(), DateUnit.DAY) <= 0 ? null : DateUtil.between(new Date(), subItem.getPlanEndTime(), DateUnit.DAY));
                     }
                 }
                 subItem.setChildren(children.stream().filter(c -> c.getParentId().equals(subItem.getId())).collect(Collectors.toList()));