diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java index 7b08f552..af9ec80b 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java @@ -538,7 +538,7 @@ public class BackReceiveServiceImpl implements BackReceiveService { // 先根据id以及modelId查询此单子有没有进行退料,如果退料则需先点击完成退料或者退料撤回操作 List allList = backReceiveMapper.getList(backApplyInfo); if (CollectionUtils.isNotEmpty(allList)) { - return AjaxResult.warn("所勾选数据:" + allList.get(0).getTypeName() + "中有退料数据未处理,请先进行完成退料或撤回处理!"); + return AjaxResult.warn("所勾选数据:" + allList.get(0).getTypeName() + "中有已进行退料操作数据未处理,请先进行完成退料或撤回处理!"); } } for (BackApplyInfo backApplyInfo : list) { diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index 50f52e83..bc445fe1 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -350,7 +350,8 @@ public class TmTaskServiceImpl implements TmTaskService { @Override public List getLeaseAuditListByOne(TmTask record) { Set 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 leaseDetailByParentId = tmTaskMapper.getLeaseDetailByjjbz(record); return leaseDetailByParentId; } else {