fix:菜单问题代码被删掉了

service-base/src/main/java/com/simuwang/base/components/ShiroLoginAuthAdapter.java

@@ -37,7 +37,7 @@ public record ShiroLoginAuthAdapter(UserAuthService userAuthService) implements
 
     @Override
     public List<String> findPermissionsByUserId(Integer userId) {
-        List<SysMenuDO> menus = this.userAuthService.listUserMenuByUserId(userId);
+        List<SysMenuDO> menus = this.userAuthService.listUserMenuByUserId(userId, 1);
         return menus.stream().map(SysMenuDO::getPerms).distinct().collect(Collectors.toList());
     }
 }

service-base/src/main/java/com/simuwang/base/components/UserAuthService.java

@@ -72,14 +72,15 @@ public class UserAuthService {
      * 根据用户id获取菜单列表
      *
      * @param userId 用户id
+     * @param status 菜单状态，1-启用，0-禁用，null全部
      * @return /
      */
-    public List<SysMenuDO> listUserMenuByUserId(Integer userId) {
+    public List<SysMenuDO> listUserMenuByUserId(Integer userId, Integer status) {
         boolean admin = this.isAdmin(userId);
         if (admin) {
-            return this.userMapper.selectAllMenu();
+            return this.userMapper.selectAllMenu(status);
         }
-        return this.userMapper.selectMenuByUserId(userId);
+        return this.userMapper.selectMenuByUserId(userId, status);
     }
 
     /**

service-base/src/main/java/com/simuwang/base/mapper/system/SysUserMapper.java

@@ -48,16 +48,17 @@ public interface SysUserMapper extends BaseMapper<SysUserDO> {
      * 根据用户id从用户角色关系表和角色权限关系表查询该用户的所有权限信息
      *
      * @param userId 用户id
+     * @param status 状态
      * @return /
      */
-    List<SysMenuDO> selectMenuByUserId(Integer userId);
+    List<SysMenuDO> selectMenuByUserId(@Param("userId") Integer userId, @Param("status") Integer status);
 
     /**
      * 获取全部权限信息
      *
      * @return /
      */
-    List<SysMenuDO> selectAllMenu();
+    List<SysMenuDO> selectAllMenu(Integer status);
 
     /**
      * 角色用户关联的分页

service-base/src/main/resources/mapper/system/SysUserMapper.xml

@@ -83,7 +83,10 @@
                  join sys_user_role t1 on sr.role_id = t1.role_id
                  join sys_user t2 on t1.user_id = t2.user_id and t2.isvalid = 1 and t2.status = 1
         where t2.user_id = #{userId}
-          and sm.isvalid = 1 and sm.status = 1
+          and sm.isvalid = 1
+        <if test="status != null">
+            and sm.status = #{status}
+        </if>
         order by sm.menu_id
     </select>
 
@@ -108,7 +111,10 @@
                sm.updaterid  as updaterId,
                sm.updatetime as updateTime
         from sys_menu sm
-        where sm.isvalid = 1 and sm.status = 1
+        where sm.isvalid = 1
+        <if test="status != null">
+            and sm.status = #{status}
+        </if>
         order by sm.menu_id
     </select>
 

service-daq/src/main/java/com/simuwang/daq/utils/ReportParseUtil.java

@@ -8,6 +8,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+import com.simuwang.base.pojo.dto.report.PythonResult;
 import com.simuwang.daq.components.CustomPDFTextStripper;
 import com.simuwang.daq.dto.ReportFundInfo;
 import com.smppw.common.pojo.ValueLabelVO;
@@ -60,6 +61,7 @@ public class ReportParseUtil {
         params.put("trust_name", null);
         String body = HttpUtil.post(baseUrl + api, JSONUtil.toJsonStr(params));
         JSONObject obj = JSONUtil.parseObj(body);
+        PythonResult<?> result = JSONUtil.toBean(JSONUtil.toJsonStr(body), PythonResult.class);
         System.out.println(obj);
 
 //        List<ValueLabelVO> fieldMapper = ListUtil.list(false);

service-manage/src/main/java/com/simuwang/manage/service/LoginService.java

@@ -98,7 +98,7 @@ public class LoginService {
                 .map(e -> new UserRoleDTO(e.getRoleId(), e.getRoleName(), e.getRoleKey()))
                 .distinct().collect(Collectors.toList());
         // 用户权限处理
-        List<SysMenuDO> menuList = this.userAuthService.listUserMenuByUserId(userId);
+        List<SysMenuDO> menuList = this.userAuthService.listUserMenuByUserId(userId, 1);
         // 过滤按钮
         List<MenuTreeDTO> tempList = menuList.stream().filter(e -> !Objects.equals("F", e.getMenuType()))
                 .map(MenuTreeDTO::new).collect(Collectors.toList());

service-manage/src/main/java/com/simuwang/manage/service/impl/system/SysMenuServiceImpl.java

@@ -77,7 +77,7 @@ public class SysMenuServiceImpl implements SysMenuService {
         // 先获取用户的所有菜单
         ShiroUser shiroUser = UserUtils.getLoginUser();
         Integer userId = shiroUser.getUserId();
-        List<SysMenuDO> dataList = this.userAuthService.listUserMenuByUserId(userId);
+        List<SysMenuDO> dataList = this.userAuthService.listUserMenuByUserId(userId, null);
         // 当有查询条件时
         if (query.getStatus() != null || StrUtil.isNotBlank(query.getKeyword())) {
             // 按条件过滤找到所有满足条件的菜单