From 36a11d78a2517b523fcf6b6ec622f3f0767f553f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 26 Sep 2023 11:22:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into wb
---
screen-manage/src/main/java/com/moral/api/service/OrganizationService.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/OrganizationService.java b/screen-manage/src/main/java/com/moral/api/service/OrganizationService.java
index eed2bfc..646358d 100644
--- a/screen-manage/src/main/java/com/moral/api/service/OrganizationService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/OrganizationService.java
@@ -1,13 +1,13 @@
package com.moral.api.service;
+import java.util.List;
+
import com.moral.api.entity.Organization;
import com.baomidou.mybatisplus.extension.service.IService;
import com.moral.api.pojo.dto.organization.OrganizationDTO;
import com.moral.api.pojo.dto.organization.OrganizationQueryDTO;
-import com.moral.api.pojo.form.organization.OrganizationDeleteForm;
-import com.moral.api.pojo.form.organization.OrganizationInsertForm;
-import com.moral.api.pojo.form.organization.OrganizationQueryForm;
-import com.moral.api.pojo.form.organization.OrganizationUpdateForm;
+import com.moral.api.pojo.dto.organization.OrganizationQueryNamesDTO;
+import com.moral.api.pojo.form.organization.*;
/**
* <p>
@@ -46,7 +46,7 @@
OrganizationDTO deleteOrganization(OrganizationDeleteForm organizationDeleteForm);
/**
- * @Description: ������������������
+ * @Description: ������������������������
* @Param: [organizationQueryForm]
* @return: com.moral.api.pojo.dto.organization.OrganizationQueryDTO
* @Author: ���������
@@ -55,4 +55,21 @@
OrganizationQueryDTO queryOrganization(OrganizationQueryForm organizationQueryForm);
+ /**
+ * @Description: ������������������������
+ * @Param: [form]
+ * @return: com.moral.api.pojo.dto.organization.OrganizationQueryNamesDTO
+ * @Author: ���������
+ * @Date: 2021/5/6
+ */
+ OrganizationQueryNamesDTO queryNames(OrganizationQueryNamesForm form);
+
+ /**
+ * @Description: ������������������������������������
+ * @Param: []
+ * @return: java.util.List<com.moral.api.entity.Organization>
+ * @Author: ���������
+ * @Date: 2021/4/14
+ */
+ List<Organization> getAllChildrenOrganization(Integer parentId);
}
--
Gitblit v1.8.0