Merge remote-tracking branch 'origin/master' into prod

purchase-admin/src/main/java/com/ozs/web/controller/base/BaseAgencyController.java

@@ -141,10 +141,10 @@ public class BaseAgencyController extends BaseController {
         if (!ObjectUtils.isEmpty(vo.getStatus())) {
             lw.eq(BaseAgency::getStatus, vo.getStatus());
         }
-        List<Integer> companyType = vo.getCompanyTypes();
+        List<Integer> companyType = vo.getCompanyType();
         StringBuilder builder = new StringBuilder();
         if (!ObjectUtils.isEmpty(companyType)) {
-            builder.append("(");
+            builder.append(" (");
             for (int i = 0; i < companyType.size(); i++) {
                 Integer type = companyType.get(i);
                 if (i != companyType.size() - 1) {
@@ -153,8 +153,8 @@ public class BaseAgencyController extends BaseController {
                     builder.append("company_type like '%").append(type).append("%' )");
                 }
             }
+            lw.apply(builder.toString());
         }
-        lw.apply(builder.toString());
         lw.orderBy(true, false, BaseAgency::getCreateTime);
         IPage<BaseAgency> page = baseAgencyService.page(new Page<BaseAgency>(vo.getPageNum(), vo.getPageSize()), lw);
         if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getRecords())) {

purchase-system/src/main/java/com/ozs/base/vo/BaseAgentPageReqVo.java

@@ -35,7 +35,7 @@ public class BaseAgentPageReqVo extends PageVo {
      * 采购类型
      */
     @ApiModelProperty("采购类型")
-    private List<Integer> companyTypes;
+    private List<Integer> companyType;
 
     @Override
     public String toString() {
@@ -43,7 +43,7 @@ public class BaseAgentPageReqVo extends PageVo {
                 "companyName='" + companyName + '\'' +
                 ", companyNature='" + companyNature + '\'' +
                 ", status=" + status +
-                ", companyTypes=" + companyTypes +
+                ", companyType=" + companyType +
                 '}';
     }
 }