Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart into dev

 Conflicts:
	src/main/java/com/baosight/hggp/hg/wd/service/ServiceHGWD002A.java
	src/main/webapp/HG/WD/HGWD001.js

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

@@ -52,12 +52,12 @@ public class ServiceHGWD002A extends ServiceEPBase {
 		try {
 			Map queryMap = EiInfoUtils.getFirstRow(inInfo);
 			String fileId = MapUtils.getString(queryMap, HGWD001.FIELD_FILE_ID);
+			String source = MapUtils.getString(queryMap, "source");
 			String node = MapUtils.getString(queryMap, CommonConstant.Field.NODE);
-			String status = MapUtils.getString(queryMap, HGWD001.FIELD_STATUS);
 			if (CommonConstant.Field.ROOT.equals(node) || CommonConstant.Field.ROOT2.equals(node)) {
 				inInfo.addBlock(node).setRows(queryTopNode(node, fileId));
 			} else {
-				inInfo.addBlock(node).setRows(queryChildNode(node,status));
+				inInfo.addBlock(node).setRows(queryChildNode(node, source));
 			}
 		} catch (Exception e) {
 			LogUtils.setMsg(inInfo, e, "查询节点失败");
@@ -91,9 +91,10 @@ public class ServiceHGWD002A extends ServiceEPBase {
 	 * 查询叶子节点
 	 *
 	 * @param parentId
+	 * @param source 1=文档库，2=文件浏览
 	 * @return
 	 */
-	public List queryChildNode(String parentId, String status) {
+	public List queryChildNode(String parentId, String source) {
 		List<Map> results = new ArrayList();
 		Map queryMap = new HashMap();
 		queryMap.put("fileId", parentId);
@@ -103,11 +104,9 @@ public class ServiceHGWD002A extends ServiceEPBase {
 		if (!(isSpare || HgWdUtils.HgWd009.isManager())) {
 			queryMap.put("userId", UserSessionUtils.getLoginName());
 		}
-		if (StringUtils.isEmpty(status) || !status.equals(HgWdConstant.FileStatus.S_0.toString())){
+		if (!"1".equals(source)) {
 			queryMap.put(HGWD001.FIELD_STATUS, HgWdConstant.FileStatus.S_1);
 		}
-
-		queryMap.put(HGWD001.FIELD_STATUS, HgWdConstant.FileStatus.S_1);
 		queryMap.put("orderBy", "B.DOC_TYPE ASC, B.DOC_NAME ASC");
 		List<HGWD002> dbWd002s = dao.query(HGWD002.QUERY, queryMap);
 		if (CollectionUtils.isEmpty(dbWd002s)) {

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

@@ -1020,8 +1020,9 @@ function saveProtFunc() {
  * 预览
  */
 let preview = function () {
+	// source:1=文档库
     let fileId = IPLATUI.EFTree.categoryTree.selectTreeNode.fileId;
-    let url = "HGWD002A?inqu_status-0-fileId=" + fileId+"&inqu_status-0-status=0";
+    let url = "HGWD002A?inqu_status-0-fileId=" + fileId+"&inqu_status-0-source=0";
     window.open(url, '_blank');
 }
 

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

@@ -4,6 +4,7 @@ $(function () {
 		"docTree": {
 			query: function (inInfo, model) {
 				inInfo.set("inqu_status-0-fileId", $("#inqu_status-0-fileId").val());
+				inInfo.set("inqu_status-0-source", $("#inqu_status-0-source").val());
 				return inInfo;
 			},
 			select: function (e) {

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

@@ -15,6 +15,7 @@
 		<div class="col-md-3">
 			<EF:EFRegion title="文件目录树" id="tree" fitHeight="true">
 				<EF:EFInput ename="fileId" cname="文件ID" blockId="inqu_status" row="0" type="hidden"/>
+				<EF:EFInput ename="source" cname="来源" blockId="inqu_status" row="0" type="hidden"/>
 				<div id="menu" style="margin-top: 12px; margin-bottom: 8px">
 					<EF:EFTree bindId="docTree" ename="node" textField="text" valueField="label" hasChildren="leaf"
 					           serviceName="HGWD002A" methodName="queryTree" expandLevel="1">