Merge branch 'release/v2.3.0' of http://192.168.0.144/dcuc-tjdsj/auth-back into feature-buservice-0621

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/auth/AppFunInfoController.java

@@ -13,6 +13,7 @@ import com.dragoninfo.dcuc.authweb.restcontroller.app.vo.AppVo;
 import com.dragoninfo.duceap.core.response.Result;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
+import com.dragonsoft.duceap.base.enums.BooleanEnum;
 import com.dragonsoft.duceap.commons.util.collections.CollectionUtils;
 import com.dragonsoft.duceap.commons.util.tree.SimpleTreeNodeItemResolver;
 import com.dragonsoft.duceap.commons.util.tree.TreeNodeUtils;
@@ -63,7 +64,7 @@ public class AppFunInfoController {
     @ApiImplicitParam(name = "appId", value = "应用id")
     @GetMapping(value = "/menuTreeList")
     public Result<List<Map<String, Object>>> getMenuTreeList(@RequestParam(value = "appId") String appId) {
-        List<TreeInfoVO> funList = iAppFunInfoFacade.getAllTreeList(appId);
+        List<TreeInfoVO> funList = iAppFunInfoFacade.getAllTreeList(appId, null);
         List<Map<String, Object>> maps = TreeNodeUtils.generateTree(funList, new SimpleTreeNodeItemResolver("code", "pid"));
         for (Map<String, Object> map : maps) {
             List children = (List) map.get("children");
@@ -100,7 +101,7 @@ public class AppFunInfoController {
     @GetMapping(value = "/menu/{appId}")
     public Result<List<Map<String, Object>>> getMenu(@PathVariable("appId") String appId) {
         //获取该应用的所有节点
-        List<TreeInfoVO> appAllTreeList = iAppFunInfoFacade.getAllTreeList(appId);
+        List<TreeInfoVO> appAllTreeList = iAppFunInfoFacade.getAllTreeList(appId, BooleanEnum.TRUE.value);
         for (TreeInfoVO treeInfoVO : appAllTreeList) {
             getPreterMission(treeInfoVO);
         }