Merge branch 'test' into dev

# Conflicts:
#	hx-sale/src/main/resources/mapper/pack/PackDetailMapper.xml

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

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

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

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

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

@@ -178,6 +178,24 @@ 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.between("t1", Contract::getStatus, FlowStatusEnum.DRAFT.getKey(), FlowStatusEnum.CANCELLATION.getKey() - 1);
@@ -198,8 +216,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)) {

hx-sale/src/main/resources/mapper/pack/PackDetailMapper.xml

@@ -17,8 +17,8 @@
                                LEFT JOIN contract t3 ON t2.contract_id = t3.id
                       WHERE FIND_IN_SET(t2.pack_detail_id,GROUP_CONCAT( t1.id ))) AS codeAPName,
                      (SELECT GROUP_CONCAT( CONCAT(
-                        "{",  bom_volume,  ",", box_long, ",", box_wide, ",", box_high, ",", rough_weight, ",", net_weight,",",pack_quantity,"}"
-                                         )) FROM pack_detail WHERE 	FIND_IN_SET(id,GROUP_CONCAT( t1.id )) ) AS dataJsonList,
+                               bom_volume,  ",", box_long, ",", box_wide, ",", box_high, ",", rough_weight, ",", net_weight,",",pack_quantity,"_"
+                         )) FROM pack_detail WHERE 	FIND_IN_SET(id,GROUP_CONCAT( t1.id )) ) AS dataJsonList,
                      sum(t1.pack_quantity)                                 packQuantity,
                      sum(t1.net_weight)                                    netWeight,
                      sum(t1.rough_weight)                                  roughWeight,