DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/lixuetao' into lixuetao

Browse Source
This commit is contained in:
xuetao.li
2023-05-16 17:41:48 +08:00
parent 8b9ad09c48 1de7549f25
commit 40e7e67760
19 changed files with 58 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-sys/src/main/java/com/adc/da/sys/controller/MenuEOController.java
+6 -15
View File
@@ -157,21 +157,12 @@ public class MenuEOController extends BaseController<MenuEO> {
if (roleId != null && !"".equals(roleId)) {
roleMenuEOPage.setRoleId(roleId);
RoleEO roleEO = roleEOService.selectByPrimaryKey(roleId);
if ("管理员".equals(roleEO.getName())) {
menuVOs.forEach(menuVO -> {
if (!"1".equals(menuVO.getIsButton())) {
menuVO.setBelong(IsBelongEnum.BELONG.getValue());
}
});
}else{
List<RoleMenuEO> roleMenuEOList =roleMenuEOService.queryByList(roleMenuEOPage);
for (MenuVO menuVO : menuVOs) {
for (RoleMenuEO roleMenuEO : roleMenuEOList){
if (StringUtils.equals(menuVO.getId(),roleMenuEO.getMenuId()) && !"1".equals(menuVO.getIsButton())){
menuVO.setBelong(IsBelongEnum.BELONG.getValue());
break;
}
List<RoleMenuEO> roleMenuEOList =roleMenuEOService.queryByList(roleMenuEOPage);
for (MenuVO menuVO : menuVOs) {
for (RoleMenuEO roleMenuEO : roleMenuEOList){
if (StringUtils.equals(menuVO.getId(),roleMenuEO.getMenuId())){
menuVO.setBelong(IsBelongEnum.BELONG.getValue());
break;
}
}
}
adc-da-sys/src/main/java/com/adc/da/sys/service/OrgEOService.java
+1 -1
View File
@@ -17,7 +17,6 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
import java.util.UUID;
@Service("orgEOService")
@Transactional
@@ -73,6 +72,7 @@ public class OrgEOService extends ServiceImpl<OrgEODao, OrgEO> implements IOrgEo
orgEO.setId(orgEO.getDepartmentCode());
baseMapper.insert(orgEO);
}else{
orgEO.setId(orgEO.getOrgCode());
baseMapper.updateById(orgEO);
}
return Result.success();