From 5c1d58556e9cd4c7603b5e16dc1640f61623af0b Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 08 Nov 2023 11:47:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-api/src/main/java/com/moral/api/service/OrganizationService.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/OrganizationService.java b/screen-api/src/main/java/com/moral/api/service/OrganizationService.java
index a200795..2c3972c 100644
--- a/screen-api/src/main/java/com/moral/api/service/OrganizationService.java
+++ b/screen-api/src/main/java/com/moral/api/service/OrganizationService.java
@@ -2,6 +2,7 @@
import com.moral.api.entity.Organization;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -25,11 +26,20 @@
List<Organization> getChildrenOrganizationsById(Integer id);
/**
- * @Description: ���������������������
- * @Param: []
+ * @Description: ������id������������
+ * @Param: [id]
* @return: com.moral.api.entity.Organization
* @Author: ���������
- * @Date: 2021/7/16
+ * @Date: 2021/9/26
*/
- Organization getStateControlStation();
+ Organization getOrganizationById(Integer id);
+
+
+ /**
+ * ������������������������
+ * @param organizationId
+ * @return
+ */
+ List<Integer> orgIdList( Integer organizationId);
+
}
--
Gitblit v1.8.0