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 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 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 mdmModuleRoleButtonEntities = mdmModuleRoleButtonDao.queryBase(mdmModuleRoleButtonEntity); - List buttonList = setButton(mdmModuleRoleButtonEntities); + List 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 map = JSONObject.parseObject(sysMenuConfigEntity.getOptions(), new TypeReference>(){}); + if(map != null && map.size() > 0){ + meta.putAll(map); + } + } moduleVo.setMeta(meta); List children = new ArrayList<>(); for (int i = 0; i < sysMenuConfigEntities.size(); i++) {