|
|
|
@ -146,7 +146,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
|
|
|
|
|
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
|
|
|
|
|
if(isPc && pcPermission){
|
|
|
|
|
if (!userProvider.get().getIsAdministrator()){
|
|
|
|
|
Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"jg_material"));
|
|
|
|
|
Object materialObj=authorizeService.getCondition2(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"jg_material"));
|
|
|
|
|
if (ObjectUtil.isEmpty(materialObj)){
|
|
|
|
|
return new ArrayList<>();
|
|
|
|
|
} else {
|
|
|
|
@ -157,7 +157,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
|
|
|
|
|
}
|
|
|
|
|
if(!isPc && appPermission){
|
|
|
|
|
if (!userProvider.get().getIsAdministrator()){
|
|
|
|
|
Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"jg_material"));
|
|
|
|
|
Object materialObj=authorizeService.getCondition2(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"jg_material"));
|
|
|
|
|
if (ObjectUtil.isEmpty(materialObj)){
|
|
|
|
|
return new ArrayList<>();
|
|
|
|
|
} else {
|
|
|
|
@ -215,6 +215,13 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
Page<MaterialEntity> page=new Page<>(materialPagination.getCurrentPage(), materialPagination.getPageSize());
|
|
|
|
|
String organized=null;
|
|
|
|
|
if (!userProvider.get().getIsAdministrator()) {
|
|
|
|
|
organized = userProvider.getOrganizeId(userId);
|
|
|
|
|
}
|
|
|
|
|
if (StringUtil.isNotNull(organized)) {
|
|
|
|
|
materialPagination.setOrgnizeId(organized);
|
|
|
|
|
}
|
|
|
|
|
IPage<MaterialEntity> userIPage= materialMapper.queryMaterial(page,materialPagination, materialQueryWrapper);
|
|
|
|
|
return materialPagination.setData(userIPage.getRecords(),userIPage.getTotal());
|
|
|
|
|
}
|
|
|
|
|