From 80c25cc35e7d6a7bba174df170f82e452be9b49a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 27 Jul 2022 23:00:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8A=9F=E8=83=BD=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=A8=A1=E5=9D=97=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/controller/FunctionController.java    | 54 -------------------
 .../service/functions/FunctionService.java    | 20 -------
 2 files changed, 74 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/FunctionController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/FunctionController.java
index b8591684..29515774 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/FunctionController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/FunctionController.java
@@ -244,58 +244,4 @@ public class FunctionController {
         }
         return res;
     }
-
-    /**
-     * 根据用户id查询菜单
-     * @param userId
-     * @param request
-     * @return
-     * @throws Exception
-     */
-    @GetMapping(value = "/getMenuByUserId")
-    @ApiOperation(value = "根据用户id查询菜单")
-    public BaseResponseInfo getMenuByUserId(@RequestParam("userId") Long userId,
-                                      HttpServletRequest request)throws Exception {
-        BaseResponseInfo res = new BaseResponseInfo();
-        try {
-            JSONArray dataArray = new JSONArray();
-            Long roleId = 0L;
-            String fc = "";
-            List<UserBusiness> roleList = userBusinessService.getBasicData(userId.toString(), "UserRole");
-            if(roleList!=null && roleList.size()>0){
-                String value = roleList.get(0).getValue();
-                if(StringUtil.isNotEmpty(value)){
-                    String roleIdStr = value.replace("[", "").replace("]", "");
-                    roleId = Long.parseLong(roleIdStr);
-                }
-            }
-            //当前用户所拥有的功能列表，格式如：[1][2][5]
-            List<UserBusiness> funList = userBusinessService.getBasicData(roleId.toString(), "RoleFunctions");
-            if(funList!=null && funList.size()>0){
-                fc = funList.get(0).getValue();
-            }
-            List<Function> dataList = functionService.getRoleFunctionLeaf();
-            if (dataList.size() != 0) {
-                for (Function function : dataList) {
-                    if (fc.contains("[" + function.getId().toString() + "]")) {
-                        String page = function.getUrl();
-                        page = page.replace("/system/", "").replace("/bill/", "")
-                                .replace("/financial/", "").replace("/report/", "")
-                                .replace("/material/","");
-                        JSONObject item = new JSONObject();
-                        item.put("id", function.getId());
-                        item.put("page", page);
-                        dataArray.add(item);
-                    }
-                }
-            }
-            res.code = 200;
-            res.data = dataArray;
-        } catch (Exception e) {
-            e.printStackTrace();
-            res.code = 500;
-            res.data = "获取数据失败";
-        }
-        return res;
-    }
 }
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/functions/FunctionService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/functions/FunctionService.java
index b74a5d0e..7ef747e1 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/functions/FunctionService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/functions/FunctionService.java
@@ -178,26 +178,6 @@ public class FunctionService {
         return list;
     }
 
-    /**
-     * 获取功能列表的叶子节点
-     * @return
-     * @throws Exception
-     */
-    public List<Function> getRoleFunctionLeaf()throws Exception {
-        FunctionExample example = new FunctionExample();
-        example.createCriteria().andEnabledEqualTo(true).andParentNumberNotEqualTo("0")
-                .andComponentNotEqualTo("/layouts/IframePageView")
-                .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
-        example.setOrderByClause("Sort");
-        List<Function> list=null;
-        try{
-            list = functionsMapper.selectByExample(example);
-        }catch(Exception e){
-            JshException.readFail(logger, e);
-        }
-        return list;
-    }
-
     public List<Function> findRoleFunction(String pnumber)throws Exception{
         FunctionExample example = new FunctionExample();
         example.createCriteria().andEnabledEqualTo(true).andParentNumberEqualTo(pnumber)