From e36d2c5ded563ad0bdb8e719fbe108bc84d6770a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 9 Jan 2022 20:27:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=B8=AD=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90=E7=9A=84?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=EF=BC=8C=E5=B0=86id=E6=8D=A2=E4=B8=BAurl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsh/erp/service/user/UserService.java | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java
index 134f954b..79d2e807 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java
@@ -1,6 +1,7 @@
 package com.jsh.erp.service.user;
 
 import com.jsh.erp.datasource.entities.*;
+import com.jsh.erp.service.functions.FunctionService;
 import com.jsh.erp.service.redis.RedisService;
 import com.jsh.erp.service.role.RoleService;
 import org.springframework.util.StringUtils;
@@ -31,10 +32,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 @Service
 public class UserService {
@@ -63,6 +61,8 @@ public class UserService {
     @Resource
     private RoleService roleService;
     @Resource
+    private FunctionService functionService;
+    @Resource
     private RedisService redisService;
 
     public User getUser(long id)throws Exception {
@@ -797,7 +797,24 @@ public class UserService {
                 }
             }
         }
-        return btnStrArr;
+        //将数组中的funId转为url
+        JSONArray btnStrWithUrlArr = new JSONArray();
+        if(btnStrArr.size()>0) {
+            List<Function> functionList = functionService.getFunction();
+            Map<Long, String> functionMap = new HashMap<>();
+            for (Function function: functionList) {
+                functionMap.put(function.getId(), function.getUrl());
+            }
+            for (Object obj : btnStrArr) {
+                JSONObject btnStrObj = JSONObject.parseObject(obj.toString());
+                Long funId = btnStrObj.getLong("funId");
+                JSONObject btnStrWithUrlObj = new JSONObject();
+                btnStrWithUrlObj.put("url", functionMap.get(funId));
+                btnStrWithUrlObj.put("btnStr", btnStrObj.getString("btnStr"));
+                btnStrWithUrlArr.add(btnStrWithUrlObj);
+            }
+        }
+        return btnStrWithUrlArr;
     }
 
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)