From c9677d4108fbe08cd3645c5db0e8cdabb293b554 Mon Sep 17 00:00:00 2001
From: lhb <1784490500@qq.com>
Date: Thu, 24 Apr 2025 09:38:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E6=A3=80=E6=9F=A5=E5=90=88?=
=?UTF-8?q?=E8=A7=84=E7=8E=87=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/THazardWorkPlanCheckServiceImpl.java | 4 ++++
.../java/com/testor/module/notice/dao/TSysOrgDao.java | 2 ++
.../resources/mapper/demo/notice/dao/TSysOrgDao.xml | 11 +++++++++++
3 files changed, 17 insertions(+)
diff --git a/zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardWorkPlanCheckServiceImpl.java b/zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardWorkPlanCheckServiceImpl.java
index 4b8df6f..a8d9694 100644
--- a/zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardWorkPlanCheckServiceImpl.java
+++ b/zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardWorkPlanCheckServiceImpl.java
@@ -85,9 +85,13 @@ public class THazardWorkPlanCheckServiceImpl extends SuperServiceImpl<THazardWor
@Override
public Page<THazardWorkPlanCheck> selectTHazardWorkPlanCheckManageList(THazardWorkPlanCheckParam tHazardWorkPlanCheckParam) {
IPage<THazardWorkPlanCheck> page = new Page<>(Long.valueOf(tHazardWorkPlanCheckParam.getPage()), Long.valueOf(tHazardWorkPlanCheckParam.getLimit()));
+ List<String> orgIdList = new ArrayList<>();
if(null != tHazardWorkPlanCheckParam.getOrgIdList() && tHazardWorkPlanCheckParam.getOrgIdList().size()>0){
tHazardWorkPlanCheckParam.setOrgIdList(orgDao.selectAllSubId(tHazardWorkPlanCheckParam.getOrgIdList()));
+ orgIdList.addAll(tHazardWorkPlanCheckParam.getOrgIdList());
}
+ orgIdList.addAll(orgDao.selectOrgIdAllSubId(ContextUtils.getLoginUser().getOrgId()));
+ tHazardWorkPlanCheckParam.setOrgIdList(orgIdList);
return this.baseMapper.selectTHazardWorkPlanCheckManageList(page,tHazardWorkPlanCheckParam);
}
diff --git a/zlmy-modules/zlmy-boot/src/main/java/com/testor/module/notice/dao/TSysOrgDao.java b/zlmy-modules/zlmy-boot/src/main/java/com/testor/module/notice/dao/TSysOrgDao.java
index f771ec9..a21a379 100644
--- a/zlmy-modules/zlmy-boot/src/main/java/com/testor/module/notice/dao/TSysOrgDao.java
+++ b/zlmy-modules/zlmy-boot/src/main/java/com/testor/module/notice/dao/TSysOrgDao.java
@@ -23,4 +23,6 @@ public interface TSysOrgDao extends SuperDao<TSysOrg> {
List<String> selectAllSubId(@Param("orgIds") List<String> orgIds);
+ List<String> selectOrgIdAllSubId(@Param("orgId") String orgId);
+
}
diff --git a/zlmy-modules/zlmy-boot/src/main/resources/mapper/demo/notice/dao/TSysOrgDao.xml b/zlmy-modules/zlmy-boot/src/main/resources/mapper/demo/notice/dao/TSysOrgDao.xml
index 0fdb0e0..f168278 100644
--- a/zlmy-modules/zlmy-boot/src/main/resources/mapper/demo/notice/dao/TSysOrgDao.xml
+++ b/zlmy-modules/zlmy-boot/src/main/resources/mapper/demo/notice/dao/TSysOrgDao.xml
@@ -37,4 +37,15 @@
</foreach>
</select>
+ <select id="selectOrgIdAllSubId" resultType="string">
+ SELECT org_id FROM t_sys_org
+ WHERE status = '0' and is_dept = '0'
+ START WITH parent_id =#{orgId}
+ CONNECT BY PRIOR org_id = parent_id
+
+ union all
+ SELECT org_id FROM t_sys_org
+ WHERE status = '0' and is_dept = '0' and org_id=#{orgId}
+ </select>
+
</mapper>
\ No newline at end of file
--
2.18.1