hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改主数据页面查询功能

This commit is contained in:
lvleigang 2024-05-15 11:12:53 +08:00
parent 73ec89af32
commit bd44a4d16a
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -54,3 +54,9 @@ $RECYCLE.BIN/
*.lnk *.lnk
/buildpackage/src/main/resources/banner.txt /buildpackage/src/main/resources/banner.txt
/webapp/target/
/service/target/
/core/target/
/common/target/
/buildpackage/target/
/webapp/target/

20
service/src/main/java/com/hzya/frame/mdm/service/impl/MdmServiceImpl.java
View File

@ -982,7 +982,7 @@ public class MdmServiceImpl implements IMdmService {
module.setRoute("integrationOptionAdmin/"+moduleEntity.getMdmCode());//路由地址 module.setRoute("integrationOptionAdmin/"+moduleEntity.getMdmCode());//路由地址
module.setMenuPage("integrationOptionV2/index");//一级Layout 二级 ParntView 三级component module.setMenuPage("integrationOptionV2/index");//一级Layout 二级 ParntView 三级component
module.setRemark("主数据生成菜单"); module.setRemark("主数据生成菜单");
module.setVisibles("1"); module.setVisibles("0");
module.setShowType("1"); module.setShowType("1");
JSONObject object1 = new JSONObject(); JSONObject object1 = new JSONObject();
object1.put("mdmId", moduleEntity.getId());//主数据id object1.put("mdmId", moduleEntity.getId());//主数据id
@ -1455,14 +1455,7 @@ public class MdmServiceImpl implements IMdmService {
if (mdmModuleEntities == null || mdmModuleEntities.size() != 1) { if (mdmModuleEntities == null || mdmModuleEntities.size() != 1) {
return BaseResult.getFailureMessageEntity("系统错误"); 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(); MdmViewVo mdmViewVo = new MdmViewVo();
mdmModuleEntity = mdmModuleEntities.get(0); mdmModuleEntity = mdmModuleEntities.get(0);
mdmViewVo.setMdmModuleEntity(mdmModuleEntity); mdmViewVo.setMdmModuleEntity(mdmModuleEntity);
@ -1537,13 +1530,8 @@ public class MdmServiceImpl implements IMdmService {
List<MdmViewFiledVo> listListVo = setQueryList(mdmModuleDbEntityList, mdmModuleDbFiledsEntityList, mdmModuleDbFiledsRuleEntityList, dolistList,true); List<MdmViewFiledVo> listListVo = setQueryList(mdmModuleDbEntityList, mdmModuleDbFiledsEntityList, mdmModuleDbFiledsRuleEntityList, dolistList,true);
mdmViewVo.setListList(listListVo); mdmViewVo.setListList(listListVo);
//获取按钮 List<MdmViewButtonVo> buttonList = new ArrayList<>();
MdmModuleRoleButtonEntity mdmModuleRoleButtonEntity = new MdmModuleRoleButtonEntity(); MdmViewButtonVo mdmViewButtonVo = new MdmViewButtonVo();
mdmModuleRoleButtonEntity.setMdmId(mdmModuleEntity.getId());
mdmModuleRoleButtonEntity.setSts("Y");
mdmModuleRoleButtonEntity.setRoleIds(userRoleList);
List<MdmModuleRoleButtonEntity> mdmModuleRoleButtonEntities = mdmModuleRoleButtonDao.queryBase(mdmModuleRoleButtonEntity);
List<MdmViewButtonVo> buttonList = setButton(mdmModuleRoleButtonEntities);
mdmViewVo.setButtonList(buttonList); mdmViewVo.setButtonList(buttonList);
return BaseResult.getSuccessMessageEntity("获取字段成功", mdmViewVo); return BaseResult.getSuccessMessageEntity("获取字段成功", mdmViewVo);

6
service/src/main/java/com/hzya/frame/sysnew/menuConfig/service/impl/SysMenuConfigServiceImpl.java
View File

@ -106,6 +106,12 @@ public class SysMenuConfigServiceImpl extends BaseService<SysMenuConfigEntity, S
}else { }else {
meta.put("hidden", true); 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); moduleVo.setMeta(meta);
List<ModuleVo> children = new ArrayList<>(); List<ModuleVo> children = new ArrayList<>();
for (int i = 0; i < sysMenuConfigEntities.size(); i++) { for (int i = 0; i < sysMenuConfigEntities.size(); i++) {