diff --git a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar index a456a9fd..8123bc67 100644 Binary files a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar and b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar differ diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/dao/PALRepository.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/dao/PALRepository.java index 9b458e2d..47636fd6 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/dao/PALRepository.java +++ b/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 { * @return 文件版本id集合 */ public Set 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 { } sql += " order by pal.PLLEVEL, pal.PLORDERINDEX "; Set idSet =new HashSet<>(); - List list = DBSql.query(sql, new PALRespositoryModelMapper()); - if (list != null && list.size() > 0) { - for (PALRepositoryModel model : list) { + System.out.println("sql============"+sql); + //List list = DBSql.query(sql, new PALRespositoryModelMapper()); + + List 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; diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java index 5c4b0939..8c28b4d8 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/web/CoeDesignerWeb.java +++ b/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 shapeIds = new ArrayList<>();// 当前流程所有节点 diff --git a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html index 562635a4..2816b372 100755 --- a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html +++ b/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>"