From 91593fcfb70317d2c161f3dbcf589d736d56ca78 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Fri, 28 Jul 2023 09:40:26 +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

---
 .../controller/admin/SystemUserAuthController.java          | 6 ++++++
 .../basicdata/service/impl/SystemUserServiceImpl.java       | 2 +-
 .../safety/service/impl/InspectRecordServiceImpl.java       | 2 +-
 .../safety/service/impl/ProjectSubItemServiceImpl.java      | 2 --
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java
index 6c39bee..6cafe28 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java
@@ -265,4 +265,10 @@ public class SystemUserAuthController {
 			return result;
 		}
 	}
+
+	public static void main(String[] args) {
+		String ssoToken = "rlyWNnjYs1_wezKRvyKvJtjb4CnWHuSY9J8nE92iGvYP5bTkK_k4meZJ0c6wqDVu";
+		ssoToken = ssoToken.replace("-", "+").replace("_", "/");
+		System.out.println(Aes.decrypt(ssoToken, "ssologin66!@#$%^"));
+	}
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
index 4f9a404..eff9826 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
@@ -75,7 +75,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
         QueryWrapper<SystemUser> wrapper = Wrappers.<SystemUser>query();
         SecurityUser user = SecurityUtil.getUser();
         wrapper.eq("u.account_type", user.getAccountType());
-        wrapper.eq("u.sn", systemUser.getSn());
+        wrapper.eq("u.sn", systemUser.getSn() == null ? user.getSn() : systemUser.getSn());
         wrapper.ne("u.user_id", user.getUserId());
         return baseMapper.getPageList(wrapper);
     }
diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java
index 8394b39..35e0fe1 100644
--- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java
@@ -232,10 +232,10 @@ public class InspectRecordServiceImpl extends ServiceImpl<InspectRecordMapper, I
     @Override
     public boolean saveInfo(InspectRecordVo inspectRecordVo) {
         SecurityUser user = SecurityUtil.getUser();
-        inspectRecordVo.setState(inspectRecordVo.getQuestionNum() == 0 ? 4 : 2);
         inspectRecordVo.setCreateTime(new Date());
         inspectRecordVo.setCreateBy(user.getUserId());
         inspectRecordVo.setQuestionNum(inspectRecordVo.getInspectQuestionList().size());
+        inspectRecordVo.setState(inspectRecordVo.getQuestionNum() == 0 ? 4 : 2);
         String inspectUser = inspectRecordVo.getInspectUser();
         inspectRecordVo.setInspectUser(StringUtils.isNotBlank(inspectUser) ? inspectUser + "," + user.getUserId() : user.getUserId());
         if (StringUtils.isNotBlank(inspectRecordVo.getEngineeringSn())) {
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 c4bd6b6..2d31e8d 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
@@ -289,8 +289,6 @@ public class ProjectSubItemServiceImpl extends ServiceImpl<ProjectSubItemMapper,
             if (DateUtil.between(projectSubItem.getPlanEndTime(), endTime, DateUnit.DAY, false) > 0){
                 if (task.getPercentageComplete().intValue() == 100 || (actualFinishDate != null && actualFinishDate.getTime() <= System.currentTimeMillis())) {
                     projectSubItem.setState(6);
-                } else  if (task.getPercentageComplete().intValue() == 0 || actualStartDate == null || actualStartDate.getTime() > System.currentTimeMillis()) {
-                    projectSubItem.setState(4);
                 } else {
                     projectSubItem.setState(5);
                 }