1.文档库未发布可预览附加

src/main/java/com/baosight/hpjx/hp/wd/service/ServiceHPWD002A.java

@@ -52,11 +52,12 @@ public class ServiceHPWD002A extends ServiceEPBase {
             Map queryMap = EiInfoUtils.getFirstRow(inInfo);
             String fileId = MapUtils.getString(queryMap, HPWD001.FIELD_FILE_ID);
             String node = MapUtils.getString(queryMap, CommonConstant.Field.NODE);
+            String source = MapUtils.getString(queryMap, "source");
             String status = MapUtils.getString(queryMap, HPWD001.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, "查询节点失败");
@@ -90,9 +91,10 @@ public class ServiceHPWD002A 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);
@@ -101,9 +103,12 @@ public class ServiceHPWD002A extends ServiceEPBase {
         if (!HpWdUtils.HpWd009.isManager()) {
             queryMap.put("userId", UserSessionUtils.getLoginName());
         }
-        if (StringUtils.isEmpty(status) || !status.equals(HpWdConstant.FileStatus.S_0.toString())){
+        if (!"0".equals(source)) {
             queryMap.put(HPWD001.FIELD_STATUS, HpWdConstant.FileStatus.S_1);
         }
+        /*if (StringUtils.isEmpty(status) || !status.equals(HpWdConstant.FileStatus.S_0.toString())){
+            queryMap.put(HPWD001.FIELD_STATUS, HpWdConstant.FileStatus.S_1);
+        }*/
 
         queryMap.put("orderBy", "B.DOC_TYPE ASC, B.DOC_NAME ASC");
         List<HPWD002> dbWd002s = dao.query(HPWD002.QUERY, queryMap);