This commit is contained in:
parent
f98a284238
commit
81a43c33f1
|
|
@ -538,7 +538,7 @@ public class BackReceiveServiceImpl implements BackReceiveService {
|
||||||
// 先根据id以及modelId查询此单子有没有进行退料,如果退料则需先点击完成退料或者退料撤回操作
|
// 先根据id以及modelId查询此单子有没有进行退料,如果退料则需先点击完成退料或者退料撤回操作
|
||||||
List<BackApplyInfo> allList = backReceiveMapper.getList(backApplyInfo);
|
List<BackApplyInfo> allList = backReceiveMapper.getList(backApplyInfo);
|
||||||
if (CollectionUtils.isNotEmpty(allList)) {
|
if (CollectionUtils.isNotEmpty(allList)) {
|
||||||
return AjaxResult.warn("所勾选数据:" + allList.get(0).getTypeName() + "中有退料数据未处理,请先进行完成退料或撤回处理!");
|
return AjaxResult.warn("所勾选数据:" + allList.get(0).getTypeName() + "中有已进行退料操作数据未处理,请先进行完成退料或撤回处理!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (BackApplyInfo backApplyInfo : list) {
|
for (BackApplyInfo backApplyInfo : list) {
|
||||||
|
|
|
||||||
|
|
@ -350,7 +350,8 @@ public class TmTaskServiceImpl implements TmTaskService {
|
||||||
@Override
|
@Override
|
||||||
public List<TmTask> getLeaseAuditListByOne(TmTask record) {
|
public List<TmTask> getLeaseAuditListByOne(TmTask record) {
|
||||||
Set<String> roles = SecurityUtils.getLoginUser().getRoles();
|
Set<String> roles = SecurityUtils.getLoginUser().getRoles();
|
||||||
if (roles.contains(STRING_JJBZ) || roles.contains(STRING_FBZ)) {
|
if (roles.contains(STRING_JJBZ) || roles.contains(STRING_FBZ) || roles.contains(STRING_EM01)
|
||||||
|
|| roles.contains(STRING_EM02) || roles.contains(STRING_EM03)) {
|
||||||
List<TmTask> leaseDetailByParentId = tmTaskMapper.getLeaseDetailByjjbz(record);
|
List<TmTask> leaseDetailByParentId = tmTaskMapper.getLeaseDetailByjjbz(record);
|
||||||
return leaseDetailByParentId;
|
return leaseDetailByParentId;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue