From 022eb34b5d3ccf94d61a921c01dd496cc2fe0d6a Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Mon, 2 Dec 2024 14:34:06 +0800
Subject: [PATCH] 12.2

---
 src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java      | 6 +++---
 src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.java | 6 ++++--
 .../java/com/yxt/portal/biz/sysmenu/SysMenuService.java     | 5 ++++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java b/src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java
index 86a6b91..5339198 100644
--- a/src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java
+++ b/src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java
@@ -300,7 +300,7 @@ public class SysMenuRest {
     public ResultBean update(@Valid @RequestBody SysMenuDto dto, @PathVariable("sid") String sid){
         ResultBean rb = ResultBean.fireFail();
         //查询菜单是否存在
-        SysMenu sysMenu = sysMenuService.fetchBySid(sid);
+        SysMenu sysMenu = sysMenuService.fetchBySid1(sid);
         if (sysMenu == null) {
             return rb.setMsg("菜单不存在");
         }
@@ -322,7 +322,7 @@ public class SysMenuRest {
     @PostMapping("/updateIsEnable/{sid}/{isEnable}")
     public ResultBean updateIsEnable(@PathVariable("sid") String sid, @PathVariable("isEnable") Integer isEnable) {
         ResultBean rb = ResultBean.fireFail();
-        SysMenu sysMenu = sysMenuService.fetchBySid(sid);
+        SysMenu sysMenu = sysMenuService.fetchBySid1(sid);
         if (sysMenu == null) {
             //查询资源是否存在
             SysSource sysSource = sysSourceService.fetchBySid(sid);
@@ -368,7 +368,7 @@ public class SysMenuRest {
     @GetMapping("/delBySids/{sid}")
     public ResultBean delBySids(@PathVariable("sid") String sid) {
         ResultBean rb = ResultBean.fireFail();
-        SysMenu sysMenu = sysMenuService.fetchBySid(sid);
+        SysMenu sysMenu = sysMenuService.fetchBySid1(sid);
         sysMenu.setIsDelete(1);
         sysMenuService.update(sysMenu,new QueryWrapper<SysMenu>().eq("sid",sid));
         return rb.success();
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 c1efe42..12b3969 100644
--- a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.java
+++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.java
@@ -41,9 +41,11 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
 	List<SysMenuVo> listAllParentByRoleSidG(String roleSid, String sid, @Param("sourceSid") String sourceSid,@Param("orgSid") String orgSid);
 
 	@Select("SELECT menu.*,sourceMenu.`sourceSid` FROM  sys_menu menu  " +
-			"LEFT JOIN sys_org_authorize sourceMenu  ON menu.sid=sourceMenu.menuSid where menu.sid=#{sid}")
+			"LEFT JOIN sys_authorize_group_detail  sourceMenu ON menu.sid = sourceMenu.menuSid where menu.sid=#{sid}")
 	SysMenu fetchBySid(@Param("sid") String sid);
-
+	@Select("SELECT menu.* FROM  sys_menu menu  " +
+			"where menu.sid=#{sid}")
+	SysMenu fetchBySid1(@Param("sid") String sid);
 	List<SysMenuTreeVo> getChildrensForMenuTree(@Param(Constants.WRAPPER) QueryWrapper<SysMenuTreeVo> qw);
 
 	/**
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 1a78123..cfc9faf 100644
--- a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuService.java
+++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuService.java
@@ -62,11 +62,14 @@ public class SysMenuService extends MybatisBaseService<SysMenuMapper, SysMenu> {
         return p;
     }
 
-    @Override
+
     public SysMenu fetchBySid(String sid) {
         return baseMapper.fetchBySid(sid);
     }
 
+    public SysMenu fetchBySid1(String sid) {
+        return baseMapper.fetchBySid1(sid);
+    }
     public List<SysMenu> listAll(SysMenuQuery query) {
         QueryWrapper<SysMenu> qw = createQueryWrapper(query);
         return baseMapper.selectList(qw);