2024-10-11 修复文档管理员文档浏览

src/main/java/com/baosight/hpjx/hp/wd/domain/HPWD099.java

@@ -84,7 +84,7 @@ public class HPWD099 extends DaoEPBase {
     private Integer previewNum = new Integer(0);		/* 预览次数*/
     private Integer downloadNum = new Integer(0);		/* 下载次数*/
     private String releaseDate = " ";		/* 发布时间*/
-    private Integer docVersion = new Integer(0);		/* 文件版本号*/
+    private Integer docVersion = new Integer(1);		/* 文件版本号*/
     private String docType = " ";		/* 文件类型*/
     private Integer operStatus = new Integer(0);
 

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

@@ -206,6 +206,9 @@ public class ServiceHPWD001 extends ServiceEPBase {
                 Map<?, ?> map = eiBlock.getRow(i);
                 HPWD099 hgwd099 = new HPWD099();
                 hgwd099.fromMap(map);
+                if (hgwd099.getOperStatus() == 0){
+                    hgwd099.setDocVersion(hgwd099.getDocVersion() + 1);
+                }
                 hgwd099.setStatus(HpWdConstant.FileStatus.S_1);
                 hgwd099.setReleaseDate(DateUtils.shortDateTime());
                 hgwd099.setOperStatus(HpWdConstant.OperStatus.S_0);

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

@@ -6,6 +6,8 @@ import com.baosight.hpjx.core.security.UserSessionUtils;
 import com.baosight.hpjx.hp.wd.constant.HpWdConstant;
 import com.baosight.hpjx.hp.wd.domain.HPWD001;
 import com.baosight.hpjx.hp.wd.domain.HPWD002;
+import com.baosight.hpjx.hp.wd.domain.HPWD099;
+import com.baosight.hpjx.hp.wd.utils.HpWdUtils;
 import com.baosight.hpjx.hp.xs.domain.User;
 import com.baosight.hpjx.util.CommonMethod;
 import com.baosight.hpjx.util.EiInfoUtils;
@@ -56,7 +58,12 @@ public class ServiceHPWD002 extends ServiceEPBase {
             Map queryRow = EiInfoUtils.getFirstRow(inInfo);
             // 仅查询已发布的文件
             queryRow.put(HPWD001.FIELD_STATUS, HpWdConstant.FileStatus.S_1);
+            // 非管理员仅查询自己有权限的项目
+            String userId = UserSessionUtils.getLoginName();
             inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, User.FIELD_USER_ID, UserSessionUtils.getUserId());
+            if (HpWdUtils.HpWd009.isManager(userId)) {
+                queryRow.remove(HPWD001.FIELD_PARENT_ID);
+            }
             builder(inInfo);
             inInfo = super.query(inInfo, HPWD002.QUERY, new HPWD002());
         } catch (Exception e) {

src/main/java/com/baosight/hpjx/hp/wd/sql/HPWD009.xml

@@ -78,7 +78,6 @@
         <include refid="columnD"/>
         FROM ${hpjxSchema}.T_HPWD009 T
         INNER JOIN ${platSchema}.XS_USER B ON T.USER_ID = B.LOGIN_NAME
-        LEFT JOIN ${platSchema}.TXSOG02 C ON B.USER_ID = C.USER_ID
         LEFT JOIN ${platSchema}.TXSOG01 D ON D.ORG_ID = T.FACTORY_CODE
         WHERE 1=1
         <include refid="condition"/>

src/main/java/com/baosight/hpjx/hp/wd/sql/HPWD099.xml

@@ -181,7 +181,7 @@
         UPDATE ${hpjxSchema}.T_HPWD099
         SET
         RELEASE_DATE = #releaseDate#,  <!--发布时间-->
-        DOC_VERSION = DOC_VERSION + 1, <!--版本号-->
+        DOC_VERSION = #docVersion#, <!--版本号-->
         STATUS = #status#,   <!-- 状态 -->
         OPER_STATUS = #operStatus#,
         <include refid="SqlBase.updateRevise"/>

src/main/webapp/HP/WD/HPWD001.js

@@ -123,25 +123,13 @@ $(function () {
                 var title = item.text;
                 let icon = 'fa fa-globe'
                 if (item.label !== 'root') {
-                    switch (item.type) {
-                        case 'company':
-                            // title = title + ' [公司]';
-                            icon = 'fa fa-building'
-                            break;
-                        case 'dept':
-                            // title = title + ' [部门]';
-                            icon = 'fa fa-users'
-                            break;
-                        case 'post':
-                            // title = title + ' [岗位]';
-                            icon = 'fa fa-user'
-                            break;
-                        case '1':
+                    switch (item.leafType) {
+                        case 'P':
                             icon = 'fa fa-clipboard'
                             break;
-                        default :
+                        case 'C':
                             icon = 'fa fa-folder'
-                        //icon = 'fa fa-home'
+                            break;
                     }
                 }
                 return '  <span class="' + icon + '" style="padding-right: 8px"> </span> <span class="titleClass" title="' + item.label + '">' + title + '</span>'

src/main/webapp/HP/WD/HPWD001.jsp

@@ -195,7 +195,8 @@
 
 <EF:EFWindow id="releaseWindow" title="发布变更" width="50%" height="30%">
     <EF:EFRegion id="inqu2" title="">
-        <EF:EFInput blockId="inqu_status" row="0" ename="changeContent" cname="变更内容" type="textarea" colWidth="12" ratio="2:10" required="true"/>
+        <EF:EFInput blockId="inqu_status" row="0" ename="changeContent" cname="变更内容" type="textarea"
+                    colWidth="12" ratio="2:10" required="true" style="height:100px"/>
     </EF:EFRegion>
     <div style="display: flex;justify-content: flex-end;">
         <EF:EFButton ename="confirmRelease" cname="确认发布"/>