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 wrapper = Wrappers.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 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); }