commit

src/main/java/io/v/nutz/zhgh/zc/controller/ZgfwGdzcbgController.java

@@ -292,16 +292,17 @@ public class ZgfwGdzcbgController {
                     	bd.pdzt,
                     	bd.wpdzt,
                     	bd.zczt,
-                    	it.name unitname,
+                    	it.NAME unitname,
                     	bd.zcFile
                     FROM
-                    	zgfw_zcxx zc
+                    	zgfw_zcxx_bdxx bd
-                    	LEFT JOIN zgfw_zcxx_bdxx bd ON bd.zcid=zc.zcid AND bd.pdPlanId=@zcpdid
+                    	LEFT JOIN zgfw_zcxx zc ON bd.zcid = zc.zcid
-                    	left join sys_unit it on it.id=zc.zclydwhid
+                    	LEFT JOIN sys_unit it ON it.id = zc.zclydwhid
-                    	LEFT JOIN `user` u ON u.id=bd.zcbdshrid
+                    	LEFT JOIN `user` u ON u.id = bd.zcbdshrid
                     $condition
                     """).setParam("zcpdid", zcpdid);
             Cnd cnd = Cnd.NEW();
+            cnd.andEX("bd.pdPlanId", "=", zcpdid);
             if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) {
                 /*if (ShiroUtil.hasRole("H04")) {
                     cnd.andEX("zc.zcghlx", "=", "1");
@@ -337,15 +338,12 @@ public class ZgfwGdzcbgController {
                 } else {
                     maps.get(i).put("img", null);
                 }
-
-
             }
             map.put("maplist", maps);
             map.put("applyDate", DateUtil.format(new Date(), "yyyy年MM月dd日"));
             if (Lang.isNotEmpty(maps)) {
                 map.put("unitname", unitname);
             }
-
             String templateUrl = "templates/zc/pdHz.xlsx";
             response.setContentType("application/octet-stream");
             ViTool.excelResponse(response, "杭州医学院固定资产盘点汇总表.xlsx");
@@ -356,7 +354,6 @@ public class ZgfwGdzcbgController {
         } catch (Exception e) {
             e.printStackTrace();
         }
-
     }
 
 

src/main/java/io/v/nutz/zhgh/zc/controller/ZgfwZcZhcxController.java

@@ -69,7 +69,9 @@ public class ZgfwZcZhcxController {
                 $condition
                 """);
         Cnd cnd = Cnd.NEW();
-        cnd.andEX(searchName, "like", "%" + searchKeyword + "%");
+        if (Strings.isNotBlank(searchName) && Strings.isNotBlank(searchKeyword)) {
+            cnd.and(searchName, "like", "%" + searchKeyword + "%");
+        }
         cnd.andEX("xx.zczt", "=", zczt);
         cnd.andEX("xx.zcghlx", "=", zcghlx);
         cnd.andEX("xx.zczt", "=", zczt);