提供钉钉菜单查询

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java

@@ -63,6 +63,8 @@ import com.google.common.cache.CacheBuilder;
 import com.taobao.api.ApiException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.val;
+import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authc.*;
 import org.slf4j.Logger;
@@ -80,6 +82,7 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiFunction;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * @Description :
@@ -1454,10 +1457,22 @@ public class WhiteController extends CoreBaseController {
                 resList.forEach(menu -> menu.setName(LocaleUtils.getLocaleRes("MENU_" + menu.getName())));
                 // 内存排序  Sort 降序 code 升序
                 resList.sort(Comparator.comparing(SysMenuDTO::getMenuSort).reversed().thenComparing(SysMenuDTO::getMenuCode));
-                return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(resList);
-            } else {
-                return ResultBean.fail("操作失败").setCode(ResourceEnumUtil.MESSAGE.FAIL.getCode()).setErrorMsg("菜单信息不存在");
             }
+            // 获取工厂信息
+            List<SysOrganize> sysUserOrganizeList = personnelService.findSysUserOrganize(sysUser.getId());
+
+            // 遍历工厂信息，并且把主工厂放在首位
+            for (int i = 0; i < sysUserOrganizeList.size(); i++) {
+                if (Objects.equals(sysUserOrganizeList.get(i).getId(), sysUser.getOrganizeId())) {
+                    Collections.swap(sysUserOrganizeList, i, 0);
+                    break;
+                }
+            }
+            Map<String, Object> map = new HashedMap();
+            map.put("sysUserOrganizeList", sysUserOrganizeList);
+
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(resList).setResultMap(map);
+
         } catch (ImppBusiException busExcep) {
             return ResultBean.fail(busExcep);
         } catch (Exception e) {
@@ -1474,10 +1489,17 @@ public class WhiteController extends CoreBaseController {
 
         SysUser sysUser = null;
 
-        String dingTalkUrl = RedisCacheTool.getSysConfigStrVal(PlatformConstWords.DINGTALK_URL);
-        String dingTalkAppKey = RedisCacheTool.getSysConfigStrVal(PlatformConstWords.DINGTALK_APP_KEY);
-        String dingTalkAppSecret = RedisCacheTool.getSysConfigStrVal(PlatformConstWords.DINGTALK_APP_SECRET);
-        String dingTalkWhiteList = RedisCacheTool.getSysConfigStrVal(PlatformConstWords.DINGTALK_WHITE_LIST);
+        String dingtalk_url = "DINGTALK_MENU_URL";
+        String dingtalk_app_key = "DINGTALK_MENU_APP_KEY";
+        String dingtalk_app_secret = "DINGTALK_MENU_APP_SECRET";
+        String dingtalk_white_list = "DINGTALK_MENU_WHITE_LIST";
+
+        String dingTalkUrl = RedisCacheTool.getSysConfigStrVal(dingtalk_url);
+        String dingTalkAppKey = RedisCacheTool.getSysConfigStrVal(dingtalk_app_key);
+        String dingTalkAppSecret = RedisCacheTool.getSysConfigStrVal(dingtalk_app_secret);
+        String dingTalkWhiteList = RedisCacheTool.getSysConfigStrVal(dingtalk_white_list);
+
+
 
         if (StringUtils.isEmpty(dingTalkUrl) ||
                 StringUtils.isEmpty(dingTalkAppKey) ||