From 36405ac7b34600fac3db0770da9ac9024eacac3f Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Tue, 7 Jan 2025 08:45:56 +0800
Subject: [PATCH] 01-07

---
 .../com/yxt/portal/apiadmin/DictTypeRest.java |  4 +--
 .../com/yxt/portal/apiadmin/SysMenuRest.java  |  2 ++
 .../yxt/portal/biz/sysmenu/SysMenuMapper.java |  1 +
 .../yxt/portal/biz/sysmenu/SysMenuMapper.xml  | 33 +++++++++++++++++++
 .../portal/biz/sysmenu/SysMenuService.java    | 16 ++++++++-
 5 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/yxt/portal/apiadmin/DictTypeRest.java b/src/main/java/com/yxt/portal/apiadmin/DictTypeRest.java
index fd87b25..73e262d 100644
--- a/src/main/java/com/yxt/portal/apiadmin/DictTypeRest.java
+++ b/src/main/java/com/yxt/portal/apiadmin/DictTypeRest.java
@@ -71,7 +71,7 @@ public class DictTypeRest{
     @PostMapping("/update/{sid}")
     @ResponseBody
     @ApiOperation(value = "数据字典类型更新")
-    ResultBean update(@Valid DictTypeDto dictTypeDto, @ApiParam(value = "数据字典类型sid", required = true) @PathVariable("sid") String sid){
+    ResultBean update(@RequestBody @Valid DictTypeDto dictTypeDto, @ApiParam(value = "数据字典类型sid", required = true) @PathVariable("sid") String sid){
         DictType dictType = dictTypeService.fetchBySid(sid);
         if (null == dictType) {
             return ResultBean.fireFail().setMsg("该数据字典类型不存在");
@@ -79,7 +79,7 @@ public class DictTypeRest{
         if (!dictTypeDto.getDictTypeCode().equals(dictType.getDictTypeCode())) {
             return ResultBean.fireFail().setMsg("数据字典类型的code值不允许修改");
         }
-        if (0 == dictTypeService.updateBySid(dictTypeDto.toMap(), sid)) {
+        if (0 == dictTypeService.updateBySid(dictTypeDto, sid)) {
             return ResultBean.fireFail().setMsg("更新失败");
         }
         return ResultBean.fireSuccess().setMsg("更新成功");
diff --git a/src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java b/src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java
index 5339198..deb0a93 100644
--- a/src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java
+++ b/src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java
@@ -334,6 +334,8 @@ public class SysMenuRest {
             }
         } else {
             sysMenu.setIsEnable(isEnable);
+            List<SysMenuTreeVo> t =sysMenuService.fetchRootMenuByMenuSid(sid);
+            sysMenuService.updateChildList(t,isEnable.toString());
             sysMenuService.updateById(sysMenu);
         }
 
diff --git a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.java b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.java
index 12b3969..91e9aea 100644
--- a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.java
+++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.java
@@ -84,5 +84,6 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
 	 * @return
 	 */
 	List<SysMenuTreeVo> fetchRootMenuBySourceSid(@Param("sourceSid") String sourceSid);
+	List<SysMenuTreeVo> fetchRootMenuByMenuSid(@Param("menuSid") String menuSid);
 	List<ButtonPermissionVo> getButtonPermissions(@Param("query") ButtonPermissionQuery query);
 }
\ No newline at end of file
diff --git a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml
index 719b9ad..035a740 100644
--- a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml
+++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml
@@ -135,6 +135,39 @@
         </if>
         ORDER BY menu.sortNo ASC
     </select>
+    <select id="fetchRootMenuByMenuSid"  resultType="com.yxt.portal.biz.sysmenu.SysMenuTreeVo">
+        SELECT menu.NAME              AS NAME,
+        menu.sid               AS sid,
+        menu.sid               AS sid,
+        source.sid   AS sourceSid,
+        menu.sortNo            AS sortNo,
+        menu.pSid              AS pSid,
+        source.sourceName      AS sourceName,
+        menu.sid AS menuRootSid,
+        menu.menuUrl           AS menuUrl,
+        menu.iconUrl           AS iconUrl,
+        menu.pageName          AS pageName,
+        menu.pageUrlRedirect   AS pageUrlRedirect,
+        menu.pageUrl           AS pageUrl,
+        menu.remarks,
+        menu.isEnable,
+        menu.menuType as menuType,
+        case menuType
+        when 0 then '目录'
+        when 1 then '菜单'
+        when 2 then '按钮'
+        end as menuTypeValue,
+        menu.isShow,
+        menu.cId as cId,menu.btnKey,
+        if(menu.pSid=0,'顶级菜单','' )as pName
+        FROM sys_menu menu
+        LEFT JOIN sys_source source ON menu.sourceSid = source.sid
+        WHERE  menu.isDelete!=1
+        <if test="menuSid !=null and menuSid !=''">
+            and menu.sid=#{menuSid}
+        </if>
+        ORDER BY menu.sortNo ASC
+    </select>
     <select id="fetchGroupBySourceSid"  resultType="com.yxt.portal.biz.sysmenu.SysMenuTreeVo">
         SELECT menu.NAME              AS NAME,
                menu.sid               AS sid,
diff --git a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuService.java b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuService.java
index cfc9faf..f75e6a8 100644
--- a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuService.java
+++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuService.java
@@ -176,7 +176,18 @@ public class SysMenuService extends MybatisBaseService<SysMenuMapper, SysMenu> {
             getChildList(listChildren);
         });
     }
-
+    public void updateChildList(List<SysMenuTreeVo> list,String state) {
+        list.forEach(str -> {
+            String sid = str.getSid();
+//            List<SysMenuTreeVo> listChildren = baseMapper.selectChildernList(sid);
+            List<SysMenuTreeVo> listChildren = baseMapper.selectChildernList(sid);
+            SysMenu sysMenu=baseMapper.selectOne(new QueryWrapper<SysMenu>().eq("sid",sid));
+            sysMenu.setIsEnable(Integer.valueOf(state));
+            baseMapper.updateById(sysMenu);
+            str.setChildren(listChildren);
+            updateChildList(listChildren,state);
+        });
+    }
     /*暂时废弃*/
 	/*private List<SysMenuTreeVo> getChildrensForMenuTree(List<SysMenuTreeVo> sysMenuVoList) {
 		List<SysMenuTreeVo> list = new ArrayList<>();
@@ -463,6 +474,9 @@ public class SysMenuService extends MybatisBaseService<SysMenuMapper, SysMenu> {
     public List<SysMenuTreeVo> fetchRootMenuBySourceSid(String sid) {
         return baseMapper.fetchRootMenuBySourceSid(sid);
     }
+    public List<SysMenuTreeVo> fetchRootMenuByMenuSid(String sid) {
+        return baseMapper.fetchRootMenuByMenuSid(sid);
+    }
     public List<ButtonPermissionVo> getButtonPermissions(ButtonPermissionQuery query) {
         //判断是不是通用的单位管理员
         Integer count=sysRoleService.selectCount(query.getUserSid(),query.getOrgSid());