feat:基础信息权限审批

qdlgxiemaosheng
1 parent 03e68566
Showing 3 changed files with 12 additions and 5 deletions
src/main/java/com/order/erp/common/utils/OrderFieldUtils.java
src/main/java/com/order/erp/domain/vo/order/OrderFieldLockApplyQueryVO.java
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
 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;
@@ -78,5 +78,10 @@ public class OrderFieldLockApplyQueryVO extends BasePageVO implements Serializab
      */
     private List<String> productionDepartment;
+    /**
+     * 业务员
+     */
+    private String businessPerson;
+
 }
@@ -299,13 +299,14 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;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&lt;OrderFieldLockAp
                     recordField.setInspectionStageFields(applyField.getInspectionStageFields());
                     recordDO.setFields(JSONObject.toJSONString(recordField));
                 }
-            }else {
+            } else {
                 recordDO.setFields(applyDO.getFields());
             }