From 8eb4ae5aee53a2529c759d95dd529d91dd25ba1d Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 28 Sep 2023 11:12:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
index 3c0806f..b691536 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
@@ -104,6 +104,27 @@
return sysDictDataMapper.selectMaps(dataQueryWrapper);
}
+ /**
+ * ������������������
+ * @return
+ */
+ @Override
+ public List<ResponsibilityUnit> seleteUnit() {
+ QueryWrapper<ResponsibilityUnit> wrapper = new QueryWrapper<>();
+ wrapper.select("unit_name","unit_id");
+ wrapper.eq("is_del",Constants.NOT_DELETE);
+ wrapper.eq("state",0);
+ wrapper.eq("is_invalid",0);
+
+ //������������������
+ List<Integer> unitList = unitResult();
+ if (CollectionUtils.isNotEmpty(unitList)){
+ wrapper.in("unit_id",unitList);
+ }
+ List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitMapper.selectList(wrapper);
+ return responsibilityUnits;
+ }
+
/**
* ���������������
--
Gitblit v1.8.0