退料申请表数据问题修改
This commit is contained in:
parent
747640caba
commit
32b1dc4932
|
|
@ -52,6 +52,7 @@ public class BackApplyServiceImpl implements BackApplyService {
|
||||||
@Override
|
@Override
|
||||||
public List<BackApplyInfo> getBackAuditList(BackApplyInfo bean) {
|
public List<BackApplyInfo> getBackAuditList(BackApplyInfo bean) {
|
||||||
Set<String> roles = SecurityUtils.getLoginUser().getRoles();
|
Set<String> roles = SecurityUtils.getLoginUser().getRoles();
|
||||||
|
Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId();
|
||||||
if (roles.contains("admin")) {
|
if (roles.contains("admin")) {
|
||||||
//管理员可以看到所有退料申请
|
//管理员可以看到所有退料申请
|
||||||
return backApplyMapper.getBackApplyListByAdmin(bean);
|
return backApplyMapper.getBackApplyListByAdmin(bean);
|
||||||
|
|
@ -59,18 +60,22 @@ public class BackApplyServiceImpl implements BackApplyService {
|
||||||
List<BackApplyInfo> backApplyInfos = new ArrayList<>();
|
List<BackApplyInfo> backApplyInfos = new ArrayList<>();
|
||||||
List<BackApplyInfo> backApplyListByAdmin = backApplyMapper.getBackApplyListByAdmin(bean);
|
List<BackApplyInfo> backApplyListByAdmin = backApplyMapper.getBackApplyListByAdmin(bean);
|
||||||
//机具分公司只能看到机具公司的退料
|
//机具分公司只能看到机具公司的退料
|
||||||
if (CollUtil.isNotEmpty(backApplyListByAdmin) && roles.contains("sgb")) {
|
if (CollUtil.isNotEmpty(backApplyListByAdmin)) {
|
||||||
for (BackApplyInfo backApplyInfo : backApplyListByAdmin) {
|
if (roles.contains("sgb") || roles.contains("jjfgs")) {
|
||||||
if (StringUtils.hasText(backApplyInfo.getCompanyId()) && backApplyInfo.getCompanyId().contains("101")) {
|
for (BackApplyInfo backApplyInfo : backApplyListByAdmin) {
|
||||||
backApplyInfos.add(backApplyInfo);
|
if (StringUtils.hasText(backApplyInfo.getCompanyId()) && backApplyInfo.getCompanyId().contains(String.valueOf(companyId))) {
|
||||||
|
backApplyInfos.add(backApplyInfo);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//调试分公司只能看到调试公司的退料
|
//调试分公司只能看到调试公司的退料
|
||||||
if (CollUtil.isNotEmpty(backApplyListByAdmin) && roles.contains("ajb")) {
|
if (CollUtil.isNotEmpty(backApplyListByAdmin)) {
|
||||||
for (BackApplyInfo backApplyInfo : backApplyListByAdmin) {
|
if (roles.contains("ajb") || roles.contains("tsfgs")) {
|
||||||
if (StringUtils.hasText(backApplyInfo.getCompanyId()) && backApplyInfo.getCompanyId().contains("102")) {
|
for (BackApplyInfo backApplyInfo : backApplyListByAdmin) {
|
||||||
backApplyInfos.add(backApplyInfo);
|
if (StringUtils.hasText(backApplyInfo.getCompanyId()) && backApplyInfo.getCompanyId().contains(String.valueOf(companyId))) {
|
||||||
|
backApplyInfos.add(backApplyInfo);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue