From b888331b6ba56caeeab12a4543fe81bac8854794 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 31 Aug 2021 17:09:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
index f407aa4..ce1ee37 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
@@ -34,6 +34,16 @@
return childrenOrganization;
}
+ @Override
+ public Organization getStateControlStation() {
+ QueryWrapper<Organization> wrapper = new QueryWrapper<>();
+ wrapper.select("id");
+ wrapper.eq("name","���������");
+ wrapper.eq("is_delete",Constants.NOT_DELETE);
+ Organization organization = organizationMapper.selectOne(wrapper);
+ return organization;
+ }
+
/**
* @Description: ���������������������������������������������������children���
* @Param: [parentId, children]
@@ -43,6 +53,7 @@
*/
private void recursionQueryChildren(Integer parentId, List<Organization> children) {
QueryWrapper<Organization> queryWrapper = new QueryWrapper();
+ queryWrapper.select("id");
queryWrapper.eq("is_delete", Constants.NOT_DELETE);
queryWrapper.eq("parent_id", parentId);
List<Organization> organizations = organizationMapper.selectList(queryWrapper);
--
Gitblit v1.8.0