网关日志限制修改

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -84,9 +84,12 @@ public class BackStageOrderController extends CommonBaseController implements Us
         if (userDTO == null) {
             return ObjectRestResponse.succ(new PageDataVO<>());
         }
-        List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone());
-        List<Integer> companyIds = branchCompanies.stream().map(BranchCompany::getId).collect(Collectors.toList());
-        dto.setCompanyIds(companyIds);
+        if(dto.getType() != 3) {
+            List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone());
+            List<Integer> companyIds = branchCompanies.stream().map(BranchCompany::getId).collect(Collectors.toList());
+            dto.setCompanyIds(companyIds);
+        }
+
         Query query = new Query(dto);
         PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.listOrder(query.getSuper()));
         List<OrderListVo> list = pageDataVO.getData();

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -128,7 +128,7 @@
             <if test="type != null">
                 and b.type = #{type}
             </if>
-            <if test="no != null">
+            <if test="no != null and no != '' ">
                 and no like CONCAT ("%", #{no}, "%")
             </if>
             <if test="name != null">
@@ -179,7 +179,7 @@
         <if test="status != null and status != -1">
             and b.status = #{status}
         </if>
-        <if test="no != null">
+        <if test="no != null and no != ''">
             and no like CONCAT ("%", #{no}, "%")
         </if>
         <if test="startTime != null and status == 4">