Merge remote-tracking branch 'origin/master'

fs-admin/pom.xml

@@ -44,11 +44,7 @@
             <artifactId>fs-framework</artifactId>
         </dependency>
 
-        <!-- 企微 qwTask Bean，Quartz 调用目标如 qwTask.processQwSopCourseMaterialTimer -->
-        <dependency>
-            <groupId>com.fs</groupId>
-            <artifactId>fs-qw-api</artifactId>
-        </dependency>
+
 
         <!-- 定时任务-->
         <dependency>

fs-service/src/main/java/com/fs/system/service/impl/SysMenuServiceImpl.java

@@ -1,24 +1,12 @@
 package com.fs.system.service.impl;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-
-import com.fs.common.core.domain.entity.TenantCompanyMenu;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.fs.common.constant.Constants;
 import com.fs.common.constant.UserConstants;
 import com.fs.common.core.domain.TreeSelect;
 import com.fs.common.core.domain.entity.SysMenu;
 import com.fs.common.core.domain.entity.SysRole;
 import com.fs.common.core.domain.entity.SysUser;
+import com.fs.common.core.domain.entity.TenantCompanyMenu;
 import com.fs.common.utils.SecurityUtils;
 import com.fs.common.utils.StringUtils;
 import com.fs.system.domain.vo.MetaVo;
@@ -27,6 +15,11 @@ import com.fs.system.mapper.SysMenuMapper;
 import com.fs.system.mapper.SysRoleMapper;
 import com.fs.system.mapper.SysRoleMenuMapper;
 import com.fs.system.service.ISysMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 菜单 业务层处理
@@ -245,10 +238,13 @@ public class SysMenuServiceImpl implements ISysMenuService
             if (!tempList.contains(menu.getParentId()))
             {
                 // 如果正常
-                if("0".equals(menu.getStatus())){
-                    recursionFnCom(menus, menu);
-                    returnList.add(menu);
-                }
+//                if("0".equals(menu.getStatus())){
+//                    recursionFnCom(menus, menu);
+//                    returnList.add(menu);
+//                }
+
+                recursionFnCom(menus, menu);
+                returnList.add(menu);
             }
         }
         if (returnList.isEmpty())
@@ -575,9 +571,10 @@ public class SysMenuServiceImpl implements ISysMenuService
             TenantCompanyMenu n = (TenantCompanyMenu) it.next();
             if (n.getParentId().longValue() == t.getMenuId().longValue())
             {
-                if("0".equals(n.getStatus())){
-                    tlist.add(n);
-                }
+//                if("0".equals(n.getStatus())){
+//                    tlist.add(n);
+//                }
+                tlist.add(n);
             }
         }
         return tlist;

pom.xml

@@ -248,13 +248,6 @@
                 <version>${fs.version}</version>
             </dependency>
 
-            <!-- 企微接口与 qwTask 等 Bean，供定时任务 invokeTarget（如 qwTask.xxx）-->
-            <dependency>
-                <groupId>com.fs</groupId>
-                <artifactId>fs-qw-api</artifactId>
-                <version>${fs.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>com.github.javen205</groupId>
                 <artifactId>IJPay-All</artifactId>