岗位过滤条件修改，并设置岗位模型不允许选择/Pal打包

com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java

@@ -2184,6 +2184,102 @@ public class PALRepositoryQueryAPIManager {
 					object.put("dutyPersionName", UtilString.isEmpty(plDutyPerson) ? "" : SDK.getORGAPI().getUserAliasNames(plDutyPerson));
 					jsonArray.add(object);
 				}
+			}else if(attrId.equals("post")){
+				if (model.getName().equals("岗位模型") || model.getMethodId().equals("org.normal")) {
+
+				JSONObject object = new JSONObject();
+				object.put("id", model.getId().trim());
+				object.put("pid", model.getNewParentId().trim());
+				if (removeIds != null && removeIds.contains(model.getId().trim())) {
+					object.put("nocheck", true);
+				} else {
+					object.put("nocheck", false);
+				}
+
+				//判断如果当前模型为岗位模型，不允许选择
+				if(model.getName().equals("岗位模型")){
+					object.put("nocheck",true);
+				}
+				object.put("plNo", CoeProcessLevelUtil.getProcessLevelNoByUUId(model.getId(), model.getWsId()).trim());
+				object.put("name", I18nRes.findValue(CoEConstant.APP_ID, context.getLanguage(), model.getName()).trim());
+				object.put("wsId", model.getWsId());
+				PALMethodModel methodModel = PALMethodCache.getPALMethodModelById(model.getMethodId());
+				if (methodModel == null || methodModel.isFolder()) {// 没有该建模方法或者是文件夹类
+					object.put("title", object.get("name"));
+				} else {
+					object.put("title", object.get("name") + " " + VersionUtil.getVersionStrV(model.getVersion()).trim());
+				}
+				//三员管理文件密级校验
+				if (HighSecurityUtil.isON() && HighSecurityUtil.fileSecuritySwitch()){
+					ResponseObject responseObject = new CoeProcessLevelWeb(DispatcherRequest.getUserContext()).checkFilePemission(model.getId());
+					if (responseObject.isErr() && (methodModel != null && !methodModel.isFolder())){
+						object.put("nocheck", true);
+					}
+				}
+				object.put("drop", false);
+				object.put("isSystemFile", model.isSystemFile());
+				object.put("plMethodId", model.getMethodId().trim());
+				if (methodModel == null || methodModel.isFolder()) {// 没有该建模方法或者是文件夹类
+					object.put("iconFont", "");
+				} else {
+					object.put("iconFont", "");
+				}
+				List<PALRepositoryModel> children = null;
+				if (isUsed) {
+					children = getUsedPalRepositoryModelsByPid(model.getWsId(), model.getId());
+					if (param != null && "designer".equals(param) && children != null && children.size() > 0) {// 过滤掉发布版本
+						List<PALRepositoryModel> tempChildren = new ArrayList<>();
+						for (PALRepositoryModel model2 : children) {
+							if (!model2.isPublish()) {
+								tempChildren.add(model2);
+							}
+						}
+						children = tempChildren;
+					}
+				} else if (isPublished) {
+					children = getPublishedPalRepositoryModelsByPid(model.getWsId(), model.getId());
+				}
+				if (children == null || children.size() == 0) {
+					object.put("isParent", false);
+					//String icon = object.getString("icon");
+					object.put("leaf", true);// 叶子节点
+					// object.put("icon", icon.replace("16.png", "16.leaf.png"));
+				} else {
+					object.put("isParent", true);
+					object.put("open", false);
+				}
+
+				object.put("plLevel", model.getLevel());
+				object.put("plOrdexIndex", model.getOrderIndex());
+				object.put("plDiagramUrl", model.getDiagramUrl());
+				object.put("isDrops", model.isSystemFile());
+				object.put("isPublish", model.isPublish());
+				object.put("isStop", model.isStop());
+				object.put("isApproval", model.isApproval());
+				object.put("ext1", model.getExt1());
+				object.put("ext2", model.getExt2());
+				object.put("ext3", model.getExt3());
+				object.put("ext4", model.getExt4());
+				object.put("isUse", model.isUse());
+				object.put("url", "./w?sid=" + context.getSessionId() + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_portal_page&ruuid=" + model.getId() + "&type=1&wsid=" + model.getWsId());
+				object.put("plCategory", model.getMethodCategory());
+				object.put("versionId", model.getVersionId());
+				object.put("orderIndex", model.getOrderIndex());
+				object.put("isBottomLevel", model.isBottomLevel());
+				String dutyDeptId = model.getDutyDept();
+				object.put("dutyDeptId", dutyDeptId == null ? "" : dutyDeptId);
+				String plDutyDeptName = dutyDeptId;
+				if (!UtilString.isEmpty(dutyDeptId)) {
+					if (SDK.getORGAPI().getDepartmentById(dutyDeptId) != null) {
+						plDutyDeptName = SDK.getORGAPI().getDepartmentById(dutyDeptId).getName();
+					}
+				}
+				object.put("dutyDeptName", UtilString.isEmpty(dutyDeptId) ? "" : plDutyDeptName);
+				String plDutyPerson = model.getDutyUser();
+				object.put("dutyPersonId", model.getDutyUser() == null ? "" : model.getDutyUser());
+				object.put("dutyPersionName", UtilString.isEmpty(plDutyPerson) ? "" : SDK.getORGAPI().getUserAliasNames(plDutyPerson));
+				jsonArray.add(object);
+				}
 			}
 
 

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

@@ -887,6 +887,7 @@ public class DesignerRelationShapeWeb extends ActionWeb {
 					if (UtilString.isNotEmpty(url)) {
 						String titles = objects.getJSONObject(i).getString("title");
 						if (titles.equals("岗位模型")) {
+							objects.getJSONObject(i).put("nocheck",true);
 							jsonArr_new.add(objects.getJSONObject(i));
 						} else {
 							List<Map<String, Object>> nodeElements = CoeDesignerUtil.getShapeMessageJson4(id);
@@ -1289,7 +1290,7 @@ public class DesignerRelationShapeWeb extends ActionWeb {
 	 */
 	public String getTreeJson(String wsId, String pid,String attrId,String uuid) {
 		JSONArray list;
-		if(attrId.equals("Process_performance_metrics") || attrId.equals("role") || attrId.equals("R_relevant_flies") || attrId.equals("L1L3_Performance")){
+		if(attrId.equals("Process_performance_metrics") || attrId.equals("role") || attrId.equals("R_relevant_flies") || attrId.equals("L1L3_Performance") || attrId.equals("post")){
 			list= PALRepositoryQueryAPIManager.getInstance().getUsedPalRepositoryTreeDataByPidAnduuid(_uc, wsId,pid,attrId,uuid);
 		}else{
 			list= PALRepositoryQueryAPIManager.getInstance().getUsedPalRepositoryTreeDataByPid(_uc, wsId, pid);