Quellcode durchsuchen

销售合同分页添加无权限过滤接口

yzc vor 1 Jahr
Ursprung
Commit
64bac84827

+ 8 - 0
hx-sale/src/main/java/com/fjhx/sale/controller/contract/ContractController.java

@@ -41,6 +41,14 @@ public class ContractController {
     }
 
     /**
+     * 外销合同表分页 不过滤权限
+     */
+    @PostMapping("/page1")
+    public Page<ContractVo> page1(@RequestBody ContractSelectDto dto) {
+        return contractService.getPage1(dto);
+    }
+
+    /**
      * 外销合同表明细
      */
     @PostMapping("/detail")

+ 5 - 0
hx-sale/src/main/java/com/fjhx/sale/service/contract/ContractService.java

@@ -33,6 +33,11 @@ public interface ContractService extends BaseService<Contract> {
     Page<ContractVo> getPage(ContractSelectDto dto);
 
     /**
+     * 外销合同表分页 不过滤权限
+     */
+    Page<ContractVo> getPage1(ContractSelectDto dto);
+
+    /**
      * 利润预算分页
      */
     Page<ContractBudgetVo> getProfitBudgetPage(ContractSelectDto dto);

+ 19 - 3
hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -176,8 +176,26 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         }
 
         IWrapper<Contract> wrapper = getWrapper();
+        wrapper.in("t1", Contract::getBuyCorporationId, authIdList);
+
+        return pageCommon(dto, wrapper);
+    }
+
+    /**
+     * 不过滤权限的分页接口
+     */
+    @Override
+    public Page<ContractVo> getPage1(ContractSelectDto dto) {
+        IWrapper<Contract> wrapper = getWrapper();
+        return pageCommon(dto, wrapper);
+    }
+
+    /**
+     * 分页公共代码抽取
+     */
+    private Page<ContractVo> pageCommon(ContractSelectDto dto, IWrapper<Contract> wrapper) {
         wrapper.orderByDesc("t1", Contract::getCreateTime);
-        wrapper.eq("t1", Contract::getIsChange,"0");//列表只展示未变更得数据
+        wrapper.eq("t1", Contract::getIsChange, "0");//列表只展示未变更得数据
         wrapper.between("t1", Contract::getStatus, FlowStatusEnum.DRAFT.getKey(), FlowStatusEnum.CANCELLATION.getKey() - 1);
         if (StringUtils.isNotEmpty(dto.getStatus())) {
             wrapper.eq("t1", Contract::getStatus, dto.getStatus());
@@ -196,8 +214,6 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         //过滤合同类型
         wrapper.eq("t1.contract_type", dto.getContractType());
 
-        wrapper.in("t1", Contract::getBuyCorporationId, authIdList);
-
         Page<ContractVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<ContractVo> list = page.getRecords();
         if (CollectionUtils.isNotEmpty(list)) {