Merge remote-tracking branch 'origin/master'

jeecg-boot-module-system/src/main/java/org/jeecg/modules/capacity/mapper/xml/SyCapacityControlMapper.xml

@@ -12,13 +12,13 @@
         select
         id,supplier,supplier_code,capacity_quota,working_hours,capacity_section,supplier_state,remarks,state,cven_code_type from sy_capacity_control
         where state != '-1'
-        <if test="supplier != null">
+        <if test="supplier != null and supplier !=''">
             and supplier=#{supplier}
         </if>
-        <if test="cvenCodeType != null">
+        <if test="cvenCodeType != null and cvenCodeType!=''">
             and cven_code_type=#{cvenCodeType}
         </if>
-        <if test="state != null">
+        <if test="state != null and state!=''">
             and supplier_state=#{state}
         </if>
         order by id desc

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/controller/SySOAndOMController.java

@@ -85,7 +85,7 @@ public class SySOAndOMController extends JeecgController<SySOAndOM, ISySOAndOMSe
     @RequestMapping(value = "/querySOList")
     public Result<?> querySOList(SySOAndOM sySOAndOM,
                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                 @RequestParam(name="pageSize", defaultValue="30") Integer pageSize) {
+                                 @RequestParam(name="pageSize", defaultValue="50") Integer pageSize) {
         if(sySOAndOM==null){
             return Result.error("请检查查询条件！！！");
         }
@@ -110,7 +110,7 @@ public class SySOAndOMController extends JeecgController<SySOAndOM, ISySOAndOMSe
     @RequestMapping(value = "/queryOMList")
     public Result<?> queryOMList(SySOAndOM sySOAndOM,
                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-                                 @RequestParam(name="pageSize", defaultValue="30") Integer pageSize) {
+                                 @RequestParam(name="pageSize", defaultValue="50") Integer pageSize) {
         if(sySOAndOM==null){
             return Result.error("请检查查询条件！！！");
         }