From bd44a4d16a81b989520542ddf8f7bce0c1f4f1a3 Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Wed, 15 May 2024 11:12:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BB=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  6 ++++++
 .../mdm/service/impl/MdmServiceImpl.java      | 20 ++++---------------
 .../impl/SysMenuConfigServiceImpl.java        |  6 ++++++
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index e5cc31db..0e9ec776 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,9 @@ $RECYCLE.BIN/
 *.lnk
 
 /buildpackage/src/main/resources/banner.txt
+/webapp/target/
+/service/target/
+/core/target/
+/common/target/
+/buildpackage/target/
+/webapp/target/
diff --git a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
index dde0b50d..35222c20 100644
--- a/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
@@ -982,7 +982,7 @@ public class MdmServiceImpl implements IMdmService {
             module.setRoute("integrationOptionAdmin/"+moduleEntity.getMdmCode());//路由地址
             module.setMenuPage("integrationOptionV2/index");//一级Layout 二级 ParntView 三级component
             module.setRemark("主数据生成菜单");
-            module.setVisibles("1");
+            module.setVisibles("0");
             module.setShowType("1");
             JSONObject object1 = new JSONObject();
             object1.put("mdmId", moduleEntity.getId());//主数据id
@@ -1455,14 +1455,7 @@ public class MdmServiceImpl implements IMdmService {
         if (mdmModuleEntities == null || mdmModuleEntities.size() != 1) {
             return BaseResult.getFailureMessageEntity("系统错误");
         }
-        //获取用户角色id
-        UserRole updateUser = new UserRole();
-        updateUser.setUserId(StpUtil.getLoginIdAsString());
-        updateUser.setSts("Y");
-        List<UserRole> userRoleList = userRoleMapper.entity_list_base(updateUser);
-        if (userRoleList == null || userRoleList.size() == 0) {
-            return BaseResult.getFailureMessageEntity("系统错误");
-        }
+
         MdmViewVo mdmViewVo = new MdmViewVo();
         mdmModuleEntity = mdmModuleEntities.get(0);
         mdmViewVo.setMdmModuleEntity(mdmModuleEntity);
@@ -1537,13 +1530,8 @@ public class MdmServiceImpl implements IMdmService {
         List<MdmViewFiledVo> listListVo = setQueryList(mdmModuleDbEntityList, mdmModuleDbFiledsEntityList, mdmModuleDbFiledsRuleEntityList, dolistList,true);
         mdmViewVo.setListList(listListVo);
 
-        //获取按钮
-        MdmModuleRoleButtonEntity mdmModuleRoleButtonEntity = new MdmModuleRoleButtonEntity();
-        mdmModuleRoleButtonEntity.setMdmId(mdmModuleEntity.getId());
-        mdmModuleRoleButtonEntity.setSts("Y");
-        mdmModuleRoleButtonEntity.setRoleIds(userRoleList);
-        List<MdmModuleRoleButtonEntity> mdmModuleRoleButtonEntities = mdmModuleRoleButtonDao.queryBase(mdmModuleRoleButtonEntity);
-        List<MdmViewButtonVo> buttonList = setButton(mdmModuleRoleButtonEntities);
+        List<MdmViewButtonVo> buttonList = new ArrayList<>();
+        MdmViewButtonVo mdmViewButtonVo = new MdmViewButtonVo();
         mdmViewVo.setButtonList(buttonList);
 
         return BaseResult.getSuccessMessageEntity("获取字段成功", mdmViewVo);
diff --git a/service/src/main/java/com/hzya/frame/sysnew/menuConfig/service/impl/SysMenuConfigServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/menuConfig/service/impl/SysMenuConfigServiceImpl.java
index 2376f8b2..dcaa4352 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/menuConfig/service/impl/SysMenuConfigServiceImpl.java
+++ b/service/src/main/java/com/hzya/frame/sysnew/menuConfig/service/impl/SysMenuConfigServiceImpl.java
@@ -106,6 +106,12 @@ public class SysMenuConfigServiceImpl extends BaseService<SysMenuConfigEntity, S
         }else {
             meta.put("hidden", true);
         }
+        if(sysMenuConfigEntity.getOptions() != null && !"".equals(sysMenuConfigEntity.getOptions())){
+            Map<String, Object> map = JSONObject.parseObject(sysMenuConfigEntity.getOptions(), new TypeReference<Map<String, Object>>(){});
+            if(map != null && map.size() > 0){
+                meta.putAll(map);
+            }
+        }
         moduleVo.setMeta(meta);
         List<ModuleVo> children = new ArrayList<>();
         for (int i = 0; i < sysMenuConfigEntities.size(); i++) {