解决发布未发布分组显示/岗位显示超过..显示/PAL打包

com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java

@@ -9941,8 +9941,37 @@ public String deleteReply(String replyid, String messageid) {
 		}
 		// 获取子文件列表
 		List<PALRepositoryModel> subList = PALRepositoryQueryAPIManager.getInstance().getUsedPalRepositoryModelsByPidNew(_uc, wsId, teamId, id);
-		if (subList != null) {
+
-			for (PALRepositoryModel subModel: subList) {
+
+		//获取子文件列表根据是否发布分组
+		Map<Boolean, List<PALRepositoryModel>> collect = subList.stream().filter(item -> UtilString.isNotEmpty(item.isPublish() + ""))
+				.collect(Collectors.groupingBy(PALRepositoryModel::isPublish));
+
+
+		//创建list分别存储，最终合并一个list
+		List<PALRepositoryModel> finaltrueList=new ArrayList<>();
+		List<PALRepositoryModel> finalfalseList=new ArrayList<>();
+	   for(Map.Entry<Boolean, List<PALRepositoryModel>> oneData:collect.entrySet()){
+
+	   	    if(oneData.getKey()==true){
+				List<PALRepositoryModel> trueList=oneData.getValue();
+				for(PALRepositoryModel onetrue:trueList){
+					finaltrueList.add(onetrue);
+				}
+			}else{
+				List<PALRepositoryModel> falseList=oneData.getValue();
+				for(PALRepositoryModel onefalse:falseList){
+					finalfalseList.add(onefalse);
+				}
+			}
+
+	   }
+		finaltrueList.addAll(finalfalseList);
+
+
+
+		if (finaltrueList != null) {
+			for (PALRepositoryModel subModel: finaltrueList) {
 				JSONObject subObj = new JSONObject();
 				subObj.put("index", index++);
 				subObj.put("id", subModel.getId());
@@ -10029,6 +10058,12 @@ public String deleteReply(String replyid, String messageid) {
 		JSONArray createUserList = UtilString.isNotEmpty(createUsers) ? JSONArray.parseArray(createUsers) : new JSONArray();
 		JSONArray orgIdList = UtilString.isNotEmpty(orgIds) ? JSONArray.parseArray(orgIds) : new JSONArray();
 		JSONArray methodIdList = UtilString.isNotEmpty(methodIds) ? JSONArray.parseArray(methodIds) : new JSONArray();
+
+
+
+
+
+
 		// 先过滤掉空的架构与空的文件夹
 		if (createUserList.size() > 0 || orgIdList.size() > 0 || methodIdList.size() > 0) {
 			tableData = tableData.stream().filter(item -> {

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.js

@@ -4522,10 +4522,10 @@ var Designer = {
                                 l = j.name + ": "
                             }
                             if (jjj.showType == "text" || jjj.showType == "attr") {
-                                l += jjj.value;
+
+                                //l += jjj.value;
                                 //判断如果岗位多个数据,...显示  by zhaolei
-                                /* if (jjj.value != "") {
+                                 if (jjj.value != "") {
-                                     debugger;
                                          var lenth = jjj.value.match(/,/g).length;
                                          if (lenth >= 2) {
                                              var index1 = jjj.value.indexOf(",");
@@ -4537,7 +4537,7 @@ var Designer = {
 
                                      }else{
                                          l += jjj.value;
-                                 }*/
+                                 }
 
                             } else {
                                 if (jjj.showType == "icon") {