|
@@ -348,11 +348,10 @@ public class DataAuthManagementFacade {
|
|
|
software.setRoles(roles);
|
|
|
//2.3数据权限详情
|
|
|
List<SoftwareDataAuthDetail> softwareDataAuthDetails = softwareDataAuthFacade.getBaseMapper().getDataAuthDetail(softwareDataAuth.getId());
|
|
|
+ software.setDataType(softwareDataAuthDetails.get(0).getDataType());
|
|
|
//--非自定义处理
|
|
|
- if (softwareDataAuthDetails.size() == 1 && softwareDataAuthDetails.get(0).getDataType() != DataAuthDataTypeEnum.CUSTOMIZE.getKey()) {
|
|
|
- software.setDataType(softwareDataAuthDetails.get(0).getDataType());
|
|
|
//--自定义处理
|
|
|
- } else if (softwareDataAuthDetails.get(0).getDataType() == DataAuthDataTypeEnum.CUSTOMIZE.getKey()) {
|
|
|
+ if (softwareDataAuthDetails.get(0).getDataType() == DataAuthDataTypeEnum.CUSTOMIZE.getKey()) {
|
|
|
//按自定义类型分类
|
|
|
Map<Integer, List<SoftwareDataAuthDetail>> softwareDataAuthDetailMap = EntityUtil.makeEntityListMap(softwareDataAuthDetails, "detailType");
|
|
|
//自定义数据
|