canrd-outside / order-erp · Commits

Commit 03e68566154b92d1230739761e83c1d73548113a

Authored by qdlgxiemaosheng
1 parent 9b21d40b
build: skipped

feat:基础信息权限审批

Inline Side-by-side
Showing 2 changed files with 6 additions and 3 deletions
src/main/java/com/order/erp/common/utils/OrderFieldUtils.java
  View file @03e6856
... ... @@ -67,9 +67,9 @@ public class OrderFieldUtils {
67 67 * @return
68 68 */
69 69 public static OrderFieldLockApplyDO generatorOtherInfoFieldLockApplyDO(OrderUnlockFieldApplyVO fieldVO, Long userId) {
70   - if (checkInspectionStageField4apply(fieldVO.getInspectionStageFields()) &&
71   - checkProfitAnalysisField4apply(fieldVO.getProfitAnalysisFields()) &&
72   - checkReportField4apply(fieldVO.getReportFields()) &&
  70 + if (checkInspectionStageField4apply(fieldVO.getInspectionStageFields()) ||
  71 + checkProfitAnalysisField4apply(fieldVO.getProfitAnalysisFields()) ||
  72 + checkReportField4apply(fieldVO.getReportFields()) ||
73 73 checkTrackStageField4apply(fieldVO.getTrackStageFields())) {
74 74 OrderLockFieldVO lockFieldVO = new OrderLockFieldVO();
75 75 fieldVO.setBaseFields(initOrderBaseField(OrderLockFieldEnum.LOCKED));
... ...
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
  View file @03e6856
... ... @@ -299,6 +299,9 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl<OrderFieldLockAp
299 299 */
300 300 private LambdaQueryWrapper<OrderFieldLockApplyDO> buildQueryByParam(OrderFieldLockApplyQueryVO queryVO) {
301 301 RoleEnum roleEnum = dataScope.getRole();
  302 + if (dataScope.isAdmin().getIsAdmin()) {
  303 + roleEnum = null;
  304 + }
302 305 Set<Long> orderIds = new HashSet<>();
303 306 if (CollectionUtils.isNotEmpty(queryVO.getCustomerCode()) || CollectionUtils.isNotEmpty(queryVO.getInnerNo())
304 307 || CollectionUtils.isNotEmpty(queryVO.getProductionDepartment()) || CollectionUtils.isNotEmpty(queryVO.getProjectNo())) {
... ...