From 9612e5fc5bf4a5dd13bf1ff63c508c72f0334f09 Mon Sep 17 00:00:00 2001
From: chenhaojie <hjchencq@isoftstone.com>
Date: Wed, 26 Jun 2024 08:46:18 +0800
Subject: [PATCH] =?UTF-8?q?das=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/das/modules/auth/mapper/SysMenuMapper.java    | 2 --
 .../das/modules/auth/service/impl/SysMenuServiceImpl.java  | 7 ++-----
 das/src/main/resources/mapper/SysMenuMapper.xml            | 5 -----
 docs/api/api_list.md                                       | 4 +---
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/das/src/main/java/com/das/modules/auth/mapper/SysMenuMapper.java b/das/src/main/java/com/das/modules/auth/mapper/SysMenuMapper.java
index 64ed4971..2ad03d8d 100644
--- a/das/src/main/java/com/das/modules/auth/mapper/SysMenuMapper.java
+++ b/das/src/main/java/com/das/modules/auth/mapper/SysMenuMapper.java
@@ -22,7 +22,5 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
 
     List<SysMenuVo> queryAllMenuList(@Param("sysMenu") SysMenuQueryDto sysMenuQueryDto);
 
-    List<SysMenuVo> queryAllMenuListByParentId(@Param("sysMenu") SysMenuQueryDto sysMenuQueryDto);
-
     SysMenuVo createTree();
 }
diff --git a/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java
index 4d06a270..78b38152 100644
--- a/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java
+++ b/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java
@@ -42,6 +42,7 @@ public class SysMenuServiceImpl implements SysMenuService {
     public int updateMenu(SysMenuDto sysMenuDto) {
         SysMenu sysMenu = new SysMenu();
         BeanCopyUtils.copy(sysMenuDto,sysMenu);
+        sysMenu.setUpdatedTime(new Date());
         return sysMenuMapper.updateById(sysMenu);
     }
 
@@ -58,14 +59,10 @@ public class SysMenuServiceImpl implements SysMenuService {
 
     @Override
     public List<SysMenuVo> queryAllMenuList(SysMenuQueryDto sysMenuQueryDto) {
-        List<SysMenuVo> list = new ArrayList<>();
         if(sysMenuQueryDto.getRecursive()) {
             sysMenuQueryDto.setParentMenuId(0L);
-            list = sysMenuMapper.queryAllMenuList(sysMenuQueryDto);
-        } else {
-            list = sysMenuMapper.queryAllMenuListByParentId(sysMenuQueryDto);
         }
-
+        List<SysMenuVo> list = sysMenuMapper.queryAllMenuList(sysMenuQueryDto);
         return list;
     }
 
diff --git a/das/src/main/resources/mapper/SysMenuMapper.xml b/das/src/main/resources/mapper/SysMenuMapper.xml
index ecf33b24..d484c5a1 100644
--- a/das/src/main/resources/mapper/SysMenuMapper.xml
+++ b/das/src/main/resources/mapper/SysMenuMapper.xml
@@ -53,11 +53,6 @@
         select * from sys_menu where parent_menu_id = #{sysMenu.parentMenuId}
     </select>
 
-    <select id="queryAllMenuListByParentId" resultMap="SysMenuMap">
-        select * from sys_menu where parent_menu_id = #{sysMenu.parentMenuId}
-    </select>
-
-
     <select id="queryChildMenus" resultMap="SysMenuChildMap">
         select * from sys_menu where parent_menu_id = #{id}
     </select>
diff --git a/docs/api/api_list.md b/docs/api/api_list.md
index f59c2fd8..1c473fa7 100644
--- a/docs/api/api_list.md
+++ b/docs/api/api_list.md
@@ -757,8 +757,7 @@
 ```json
 {
 "userName":"xx",
-"orgId":"xxx",
-"phone":"xxx"
+"orgId":"xxx"
 }
 ```
 
@@ -768,7 +767,6 @@
 |:---------| :------: | :---: |:--------------------------|
 | userName |  String  |  Yes  | 模糊查询职员名称，当职员名称为空时查询所有职员信息 |
 | orgId    |  BIGINT  |  Yes  | 所属机构ID                    |
-| phone    |  String  |  Yes   | 手机号，模糊查询                  |
 
 调用成功返回示例