From dc0c8cf089d92c7bc6d43b20cacd889f157d6899 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Wed, 9 Aug 2023 16:04:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E7=BB=84=E7=BB=87=E4=BF=A1=E6=81=AF=E7=9A=84=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/GroupManagementController.java      | 14 ++++++++++++++
 .../groupmanagement/dao/GroupManagementMapper.java |  2 ++
 .../service/GroupManagementService.java            |  4 ++++
 .../service/impl/GroupManagementServiceImpl.java   |  5 +++++
 .../mybatis/mapper/GroupManagementMapper.xml       | 11 +++++++++++
 5 files changed, 36 insertions(+)

diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java
index 1b8574e1..329f4b12 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/controller/GroupManagementController.java
@@ -194,4 +194,18 @@ public class GroupManagementController {
             return R.ok("设置失败");
         }
     }
+
+
+    @PostMapping("/findAllGroupInfo")
+    @ApiOperation(value = "查询所有组织信息", httpMethod = "POST")
+    @SysLog(operation = "查询所有组织信息")
+    public R findAllGroupInfo() {
+
+        try {
+            List<GroupManagementEntity> groups = groupManagementService.findAllGroupInfo();
+            return R.ok().put("groupInfo",groups);
+        } catch (Exception e) {
+            return R.error();
+        }
+    }
 }
diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/dao/GroupManagementMapper.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/dao/GroupManagementMapper.java
index dce49143..6282ffd1 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/dao/GroupManagementMapper.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/dao/GroupManagementMapper.java
@@ -43,4 +43,6 @@ public interface GroupManagementMapper {
     int deleteGroup(@Param(value = "id") String id);
 
     int countEntIdNumByXfnsrsbh(@Param("xfnsrsbh") String xfnsrsbh);
+
+    List<GroupManagementEntity> findAllGroupInfo();
 }
diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java
index 03ccdd05..dfa473a2 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java
@@ -54,4 +54,8 @@ public interface GroupManagementService {
      */
     List<GroupManagementEntity> queryByGroupIdList(List<String> groupIdList);
 
+    /**
+     * 查询所有组织信息
+     */
+    List<GroupManagementEntity> findAllGroupInfo();
 }
diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java
index 3253db74..1d67585c 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java
@@ -206,6 +206,11 @@ public class GroupManagementServiceImpl implements GroupManagementService {
         return groupManagementMapper.queryByGroupIdList(groupIdList, OrderInfoEnum.ORDER_KPZZGL_CXLX_1.getKey());
     }
 
+    @Override
+    public List<GroupManagementEntity> findAllGroupInfo() {
+        return groupManagementMapper.findAllGroupInfo();
+    }
+
 
     /**
      * 构建组织树集合
diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml
index e95e0529..8e845078 100644
--- a/order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml
+++ b/order-management-base-service/src/main/resources/mybatis/mapper/GroupManagementMapper.xml
@@ -273,4 +273,15 @@
         WHERE
             id = #{id}
     </delete>
+
+
+    <select id="findAllGroupInfo" resultType="com.dxhy.order.baseservice.module.groupmanagement.model.GroupManagementEntity">
+        select group_id,group_name,xhf_nsrsbh
+        from sys_group_management
+        where data_source = '0'
+        and is_default = '0'
+        and data_status = '0'
+        and del_flag='0'
+        group by group_id
+    </select>
 </mapper>