From 820fde4dc19a0205ea4a48b8dd08979a8b212f30 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期三, 04 九月 2024 11:08:51 +0800
Subject: [PATCH] 信息公式
---
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java | 2 +-
project-system/src/main/java/com/project/system/service/impl/SysDeptServiceImpl.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
index db16813..e9ee077 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
@@ -213,7 +213,7 @@
{
List<EnforceOrder> list = this.list(lq()
.eq(EnforceOrder::getIsShow, 1)
- .eq(EnforceOrder::getOrderStatus, 4)
+ .ge(EnforceOrder::getOrderStatus, 4)
);
return Convert.toList(EnforceOrderVo.class, list);
}
diff --git a/project-system/src/main/java/com/project/system/service/impl/SysDeptServiceImpl.java b/project-system/src/main/java/com/project/system/service/impl/SysDeptServiceImpl.java
index 6791398..c2ac98b 100644
--- a/project-system/src/main/java/com/project/system/service/impl/SysDeptServiceImpl.java
+++ b/project-system/src/main/java/com/project/system/service/impl/SysDeptServiceImpl.java
@@ -305,7 +305,7 @@
public Long getCheckDeptIdByLoginDeptId(Long deptId)
{
SysDept loginDept = selectDeptById(deptId);
- if (loginDept.getParentId()==100){
+ if (loginDept.getDeptId()==100 || loginDept.getParentId()==100){
return loginDept.getDeptId();
} else {
return getCheckDeptIdByLoginDeptId(loginDept.getParentId());
--
Gitblit v1.9.1