阅览已废止提示/架构视图显示

com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/dao/PALRepository.java

@@ -18,6 +18,7 @@ import java.util.Set;
 
 import com.actionsoft.apps.AppsConst;
 import com.actionsoft.apps.lifecycle.api.AppsAPIManager;
+import com.actionsoft.bpms.commons.database.RowMap;
 import com.actionsoft.bpms.commons.database.RowMapper;
 import com.actionsoft.bpms.commons.mvc.dao.DaoObject;
 import com.actionsoft.bpms.commons.pagination.SQLPagination;
@@ -3145,7 +3146,7 @@ public class PALRepository extends DaoObject<PALRepositoryModel> {
 	 * @return 文件版本id集合
 	 */
 	public Set<String> getRepositoryVersionIdListByPublishRole(String roleId, String wsIds, String category) {
-		String sql = "select distinct(pal.ID), pal.* from APP_ACT_COE_PAL_USERGRP_PERM p, APP_ACT_COE_PAL_USERGRP_ROLE r, APP_ACT_COE_PAL_REPOSITORY pal" + " where r.ROLEID = '" + roleId + "' and r.GROUPID = p.GROUPID and p.RESOURCEID = pal.PLVERSIONID and pal.ISPUBLISH = 1";
+		String sql = "select distinct(pal.ID), pal.PLVERSIONID, pal.PLLEVEL, pal.PLORDERINDEX from APP_ACT_COE_PAL_USERGRP_PERM p, APP_ACT_COE_PAL_USERGRP_ROLE r, APP_ACT_COE_PAL_REPOSITORY pal" + " where r.ROLEID = '" + roleId + "' and r.GROUPID = p.GROUPID and p.RESOURCEID = pal.PLVERSIONID and pal.ISPUBLISH = 1";
 		if (wsIds != null && !"".equals(wsIds)) {
 			sql += " and pal.WSID in (" + wsIds + ")";
 		}
@@ -3154,10 +3155,19 @@ public class PALRepository extends DaoObject<PALRepositoryModel> {
 		}
 		sql += " order by pal.PLLEVEL, pal.PLORDERINDEX ";
 		Set<String> idSet =new HashSet<>();
-		List<PALRepositoryModel> list = DBSql.query(sql, new PALRespositoryModelMapper());
+		System.out.println("sql============"+sql);
-		if (list != null && list.size() > 0) {
+		//List<PALRepositoryModel> list = DBSql.query(sql, new PALRespositoryModelMapper());
-			for (PALRepositoryModel model : list) {
+
+		List<RowMap> rowMapList = DBSql.getMaps(sql);
+
+
+		if (rowMapList != null && rowMapList.size() > 0) {
+			/*for (PALRepositoryModel model : list) {
 				idSet.add(model.getVersionId());
+			}*/
+
+			for(RowMap oneRowMap:rowMapList){
+				idSet.add(oneRowMap.getString("PLVERSIONID"));
 			}
 		}
 		return idSet;

com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java

@@ -3095,6 +3095,9 @@ public class CoeDesignerWeb extends ActionWeb {
 		sb.append(plModel.getName());
 		ids.add(plModel.getId());
 		getFilePath(sb, ids, plModel);
+
+
+		macroLibraries.put("isStop", plModel.isStop());
 		macroLibraries.put("toolbarName", sb.toString());
 
 		List<String> shapeIds = new ArrayList<>();// 当前流程所有节点

com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html

@@ -221,6 +221,7 @@
         var wsId = "<#wsId>";
         var isLaneAttrConfig = <#isLaneAttrConfig>;
         var isLaneForceRefreshShapeAttr = <#isLaneForceRefreshShapeAttr>;
+        var isStop="<#isStop>"
     </script>
     <script type="text/javascript">
         var sid = "<#sid>";
@@ -1262,4 +1263,5 @@
 </div>
 </body>
 
+
 </html>

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js

@@ -6,6 +6,7 @@ var linkType; // 链接类型：custom：自定义链接；file：文件链接
 $(document).ready(function() {
     showPainting();
     showByType();
+
     setTimeout(function() {
         Designer.hotkey.init();// 解决快捷健绑定不成功
         DesignerCopyPaste.changeTitleListen();
@@ -13,8 +14,15 @@ $(document).ready(function() {
             Utils.selectShape(selectedElementId);
         }// 复制粘贴形状内容同步的监听
     }, 1000);
+    checkIsStop();
 });
 
+//判断是否是已废止文件，如果是已废止文件给出标识
+function checkIsStop() {
+    if(isStop=="true"){
+        $("#toolbarname").append("<font color='red'>(已废止)</font>");
+    }
+}
 
 /**
  * //制度的活动属性改为条款，表单去掉活动属性
@@ -2476,4 +2484,8 @@ function openLinkUrlRewrite(type, url, target, uuid, obj, fileName, inspected) {
             }
         })
     }
+
+
 }
+
+