Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev

src/main/java/com/baosight/hggp/hg/wd/service/ServiceHGWD002.java

@@ -11,6 +11,8 @@ import com.baosight.hggp.hg.xs.domain.User;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.EiInfoUtils;
 import com.baosight.hggp.util.LogUtils;
+import com.baosight.hggp.util.MapUtils;
+import com.baosight.hggp.util.StringUtils;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.service.impl.ServiceBase;
@@ -53,6 +55,11 @@ public class ServiceHGWD002 extends ServiceBase {
 	public EiInfo query(EiInfo inInfo) {
 		try {
 			Map queryRow = EiInfoUtils.getFirstRow(inInfo);
+			// 未选择文件目录时，返回空
+			String fileId = MapUtils.getString(queryRow, HGWD001.FIELD_FILE_ID);
+			if (StringUtils.isBlank(fileId)) {
+				return inInfo;
+			}
 			// 仅查询已发布的文件
 			queryRow.put(HGWD001.FIELD_STATUS, HgWdConstant.FileStatus.S_1);
 			// 管理员不做权限验证

src/main/webapp/HG/WD/HGWD002.js

@@ -11,10 +11,7 @@ $(function () {
 			// 显示授权按钮
 			showAuthButton();
 		}, 1000);
-		// 查询
-		$("#QUERY").on("click", function (e) {
-			resultGrid.dataSource.page(1);
-		});
+
 		// 分割线组件
 		(function () {
 			splitter = $("#splitter").kendoSplitter({
@@ -161,7 +158,7 @@ $(function () {
 		"result": {
 			exportGrid: false, // 隐藏右侧自定义导出按钮
 			pageable: {
-				pageSize: 50,
+				pageSize: 500,
 				pageSizes: [20, 50, 100, 200, 500],
 			},
 			columns: [{
@@ -213,15 +210,20 @@ $(function () {
  */
 $(window).load(function () {
 	// 查询
-	//query();
+	// query();
 	// 按键事件
-	downKeyUp();
+	// downKeyUp();
 });
 
 /**
  * 查询
  */
 let query = function () {
+	let fileId = $("#inqu_status-0-fileId").val();
+	if (isBlank(fileId)) {
+		message("请选择文件目录，再进行查询");
+		return;
+	}
 	resultGrid.dataSource.page(1);
 }
 

src/main/webapp/HG/WD/HGWD002.jsp

@@ -45,8 +45,8 @@
 			</EF:EFRegion>
 
 			<EF:EFRegion id="result" title="明细信息" fitHeight="true">
-				<EF:EFGrid blockId="result" autoDraw="override" showCount="true" height="73vh" queryMethod="query"
-				           sort="setted" checkMode="row">
+				<EF:EFGrid blockId="result" autoDraw="override" showCount="true" height="73vh" sort="setted"
+				           checkMode="row">
 					<EF:EFColumn ename="id" cname="ID" hidden="true"/>
 					<EF:EFColumn ename="fileId" cname="ID" hidden="true"/>
 					<EF:EFColumn ename="docId" cname="文件ID" enable="false" width="120" align="center" sort="false"