From 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_

---
 screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java |   10 +++-------
 1 files changed, 3 insertions(+), 7 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 0d730ba..0e406e1 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
@@ -36,15 +36,11 @@
     }
 
     @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;
+    public Organization getOrganizationById(Integer id) {
+        return organizationMapper.selectById(id);
     }
 
+
     /**
     * @Description: ���������������������������������������������������children���
             * @Param: [parentId, children]

--
Gitblit v1.8.0