Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/elephant/framework/galaxy/aroad/module/zhyh/controller/ZhyhDzxgcglGcxxController.java

 package com.elephant.framework.galaxy.aroad.module.zhyh.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.elephant.framework.galaxy.aroad.module.zhyh.entity.ZhyhDzxgcglGcxxTreeOne;
@@ -32,10 +33,13 @@ public class ZhyhDzxgcglGcxxController extends BaseController  {
    * @param page 分页对象
    * @param zhyhDzxgcglGcxx 智慧养护_大中修工程管理_工程信息
    * @return
+   * @param:   gcmc [工程名称]
+   * @param:   htmc [合同名称]
+   * @param:   gydw [管养单位]
    */
   @GetMapping("/page")
   public R getZhyhDzxgcglGcxxPage(Page page, ZhyhDzxgcglGcxx zhyhDzxgcglGcxx) {
-    return  new R<>(zhyhDzxgcglGcxxService.page(page,Wrappers.query(zhyhDzxgcglGcxx)));
+    return  new R<>(zhyhDzxgcglGcxxService.page(page,Wrappers.<ZhyhDzxgcglGcxx>lambdaQuery().like(StringUtils.isNotEmpty(zhyhDzxgcglGcxx.getGcmc()),ZhyhDzxgcglGcxx::getGcmc,zhyhDzxgcglGcxx.getGcmc()).like(StringUtils.isNotEmpty(zhyhDzxgcglGcxx.getHtmc()),ZhyhDzxgcglGcxx::getHtmc,zhyhDzxgcglGcxx.getHtmc()).eq(StringUtils.isNotEmpty(zhyhDzxgcglGcxx.getGydw()),ZhyhDzxgcglGcxx::getGydw,zhyhDzxgcglGcxx.getGydw())));
   }
 
   /**