diff --git a/src/main/java/com/order/erp/common/utils/OrderFieldUtils.java b/src/main/java/com/order/erp/common/utils/OrderFieldUtils.java index de998ef..3cf8e3d 100644 --- a/src/main/java/com/order/erp/common/utils/OrderFieldUtils.java +++ b/src/main/java/com/order/erp/common/utils/OrderFieldUtils.java @@ -1,6 +1,7 @@ package com.order.erp.common.utils; import com.alibaba.fastjson.JSONObject; +import com.order.erp.common.constant.Constant; import com.order.erp.domain.ApplyStatusEnum; import com.order.erp.domain.ApplyTypeEnum; import com.order.erp.domain.OrderLockFieldEnum; @@ -54,7 +55,7 @@ public class OrderFieldUtils { lockFieldVO.setReportFields(initReportField(OrderLockFieldEnum.LOCKED)); lockFieldVO.setTrackStageFields(initTrackStageField(OrderLockFieldEnum.LOCKED)); applyDO.setFields(JSONObject.toJSONString(lockFieldVO)); - applyDO.setAuditRoleCodes(RoleEnum.BUSINESS_USER.getCode()); + applyDO.setAuditRoleCodes(RoleEnum.BUSINESS_USER.getCode() + Constant.COMMA_CHARACTER + RoleEnum.ADMIN.getCode()); return applyDO; } else { return null; diff --git a/src/main/java/com/order/erp/domain/vo/order/OrderFieldLockApplyQueryVO.java b/src/main/java/com/order/erp/domain/vo/order/OrderFieldLockApplyQueryVO.java index 3409a94..ae1a050 100644 --- a/src/main/java/com/order/erp/domain/vo/order/OrderFieldLockApplyQueryVO.java +++ b/src/main/java/com/order/erp/domain/vo/order/OrderFieldLockApplyQueryVO.java @@ -78,5 +78,10 @@ public class OrderFieldLockApplyQueryVO extends BasePageVO implements Serializab */ private List<String> productionDepartment; + /** + * 业务员 + */ + private String businessPerson; + } diff --git a/src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java b/src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java index cd3c4f6..08f52cf 100644 --- a/src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java +++ b/src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java @@ -299,13 +299,14 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl<OrderFieldLockAp */ private LambdaQueryWrapper<OrderFieldLockApplyDO> buildQueryByParam(OrderFieldLockApplyQueryVO queryVO) { RoleEnum roleEnum = dataScope.getRole(); - if (dataScope.isAdmin().getIsAdmin()) { - roleEnum = null; + if (RoleEnum.BUSINESS_USER.getCode().equals(roleEnum.getCode())) { + queryVO.setBusinessPerson(dataScope.getLoginUserName()); } Set<Long> orderIds = new HashSet<>(); - if (CollectionUtils.isNotEmpty(queryVO.getCustomerCode()) || CollectionUtils.isNotEmpty(queryVO.getInnerNo()) + if (StringUtils.isNotBlank(queryVO.getBusinessPerson()) || CollectionUtils.isNotEmpty(queryVO.getCustomerCode()) || CollectionUtils.isNotEmpty(queryVO.getInnerNo()) || CollectionUtils.isNotEmpty(queryVO.getProductionDepartment()) || CollectionUtils.isNotEmpty(queryVO.getProjectNo())) { List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.list(new LambdaQueryWrapper<OrderBaseInfoDO>() + .eq(StringUtils.isNotBlank(queryVO.getBusinessPerson()), OrderBaseInfoDO::getBusinessPerson, queryVO.getBusinessPerson()) .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN) .in(CollectionUtils.isNotEmpty(queryVO.getCustomerCode()), OrderBaseInfoDO::getCustomerCode, queryVO.getCustomerCode()) .in(CollectionUtils.isNotEmpty(queryVO.getInnerNo()), OrderBaseInfoDO::getInnerNo, queryVO.getInnerNo()) @@ -422,7 +423,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl<OrderFieldLockAp recordField.setInspectionStageFields(applyField.getInspectionStageFields()); recordDO.setFields(JSONObject.toJSONString(recordField)); } - }else { + } else { recordDO.setFields(applyDO.getFields()); }