角色数据筛选及流程阅览页面

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

@@ -756,12 +756,12 @@ public class DesignerRelationShapeWeb extends ActionWeb {
 
 		String	treeJson=getTreeJson(wsId, "", category, type, method,ruuid,attrId);
 
+		boolean showflag=true;
 		//JSONObject jsonObject = JSONObject.parseObject(json);
 		JSONArray jsonArr_new= new JSONArray();
 		JSONArray objects=JSONArray.parseArray(treeJson);
-		System.out.println("objects================="+objects);
 		//角色图属性代码是role/绩效图属性代码为Process_performance_metrics进行判断
-		if (attrId.equals("role") || attrId.equals("Process_performance_metrics")) {
+		if (attrId.equals("Process_performance_metrics")) {
 			if (objects != null) {
 				for (int i = 0; i < objects.size(); i++) {
 					JSONObject jsonObject = objects.getJSONObject(i);
@@ -772,10 +772,7 @@ public class DesignerRelationShapeWeb extends ActionWeb {
 						List data=new ArrayList();
 						data.add(0,jsonObject.getString("plMethodId"));
 						data.add(1,ruuid);
-						System.out.println("data=================="+data);
-						System.out.println("id===================="+id);
 						RowMap rowMap = DBSql.getMap("SELECT EXT2 FROM APP_ACT_COE_PAL_REPOSITORY WHERE ID=? AND EXT2=?", id, data.toString());
-						System.out.println("rowmap============"+rowMap);
 						if (rowMap != null) {
 							jsonArr_new.add(objects.getJSONObject(i));
 						}
@@ -784,9 +781,56 @@ public class DesignerRelationShapeWeb extends ActionWeb {
 					}
 				}
 			}
-			System.out.println("treeData======================1111111="+jsonArr_new.toString());
 			macroLibraries.put("treeData", jsonArr_new.toString());
-		} else if(attrId.equals("post")){
+		}else if(attrId.equals("role")) {
+			if (objects != null) {
+				for (int i = 0; i < objects.size(); i++) {
+					JSONObject jsonObject = objects.getJSONObject(i);
+					String id = jsonObject.getString("id");
+					String isParent=jsonObject.getString("isParent");
+					if (isParent != null) {
+
+						if (isParent.equals("true")) {
+
+							List<PALRepositoryModel> coeProcessLevelModels = CoeProcessLevelDaoFacotory.createCoeProcessLevel().getCoeProcessLevelByPid(id, wsId);
+							if (coeProcessLevelModels.size() > 0) {
+							for (int k = 0; k < coeProcessLevelModels.size(); k++) {
+								PALRepositoryModel coeProcessLevelModel = coeProcessLevelModels.get(k);
+								if (coeProcessLevelModel != null) {
+									List data = new ArrayList();
+									data.add(0, "org.role");
+									data.add(1, ruuid);
+									RowMap rowMap = DBSql.getMap("SELECT EXT2 FROM APP_ACT_COE_PAL_REPOSITORY WHERE ID=? AND EXT2=?", coeProcessLevelModel.getId(), data.toString());
+									if (rowMap != null) {
+										showflag=false;
+										if (showflag==false) {
+											jsonArr_new.add(objects.getJSONObject(i));
+											showflag=true;
+										}
+										JSONObject json = getJSon(coeProcessLevelModel);
+										jsonArr_new.add(json);
+									}
+								}
+							}
+						}
+						}else{
+							List data=new ArrayList();
+							data.add(0,jsonObject.getString("plMethodId"));
+							data.add(1,ruuid);
+							RowMap rowMap = DBSql.getMap("SELECT EXT2 FROM APP_ACT_COE_PAL_REPOSITORY WHERE ID=? AND EXT2=?", id, data.toString());
+							if (rowMap != null) {
+								jsonArr_new.add(objects.getJSONObject(i));
+							}
+						}
+					}else{
+						jsonArr_new.add(objects.getJSONObject(i));
+					}
+
+				}
+			}
+			macroLibraries.put("treeData", jsonArr_new.toString());
+
+		}else if(attrId.equals("post")){
 			if (objects != null) {
 				for (int i = 0; i < objects.size(); i++) {
 					String  id= objects.getJSONObject(i).getString("id");

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

@@ -8202,7 +8202,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
 						String str1=name1.substring(0, name1.lastIndexOf(".")+1);
 						String str2=name1.substring(str1.length()+1, name1.length());
 
-						propertyDao.updatePropertyByPropertyId(model.getId(), "Process_Architecture_L"+index, str2);
+						propertyDao.updatePropertyByPropertyId(model.getId(), "Process_Architecture_L"+index, str2.trim());
 						index++;
 					}
 				}

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

@@ -829,6 +829,7 @@
             color : #000000;
             font-size : 16px;
             font-weight: bold;
+            padding:8px 0!important;
         }
         .newadd_up{
             position: absolute;right:10px;top:10px;

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

@@ -5485,7 +5485,7 @@ var Designer = {
             //图形的链接
             o.find(".shape_link_point").remove();
             if (q.link) {
-                var y = $("<div class='shape_link_point' style='cursor: pointer; position: absolute; right: -14px; bottom: -0px; width: 10px; height: 10px; color: #515151;'>" +
+                var y = $("<div class='shape_link_point' style='cursor: pointer; position: absolute; right: 20px; bottom: 20px; width: 10px; height: 10px; color: #515151;'>" +
                     "<i class='awsui-iconfont' awsui-qtip='链接' style='cursor: pointer; font-size: 13px;'>&#xe7d7;</i>" +
                     "</div>").appendTo(o);
                 y.on("mousedown.link",