From fe5fc27dc9a2180b215cf538358bd622402dc41a Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 29 六月 2023 18:22:01 +0800
Subject: [PATCH] 重置功能调整

---
 igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml        |    4 ++--
 igds-inout/src/main/java/com/ld/igds/m/service/HContractManageService.java |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HContractManageService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HContractManageService.java
index 5b4b8b6..30878f1 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HContractManageService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HContractManageService.java
@@ -25,7 +25,7 @@
         args.put("companyId", ContextUtil.getCompanyId());
         args.put("deptId", ContextUtil.subDeptId(null));
 
-        if (null != param || param.size() != 0) {
+        if (null != param && param.size() != 0) {
             String str = (String) param.get("type");
             if (StringUtils.isNotEmpty(str)) {
                 hql += " and type =:type";
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml
index bab255d..09dfc76 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml
@@ -472,8 +472,8 @@
             <Property name="iconClass">fa fa-refresh</Property>
           </Button>
           <Button>
-            <ClientEvent name="onClick">view.get(&quot;#dsParam&quot;).setData({type:'1'});&#xD;
-view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,{type:'1'}).flushAsync();</ClientEvent>
+            <ClientEvent name="onClick">view.get(&quot;#dsParam&quot;).setData({});&#xD;
+view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,{}).flushAsync();</ClientEvent>
             <Property name="exClassName">btn-warn</Property>
             <Property name="iconClass">fa fa-refresh</Property>
             <Property name="caption">閲嶇疆</Property>

--
Gitblit v1.9.3