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 8d2c787d..f8d735a8 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/job/SynchronousOrgJob.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousOrgJob.java index 00d7ca72..06831f5d 100644 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousOrgJob.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousOrgJob.java @@ -88,11 +88,10 @@ public class SynchronousOrgJob implements IJob { String id1 = UUIDGener.getUUID(); Timestamp nowTime = new Timestamp(System.currentTimeMillis()); - Connection open = DBSql.open(); if (org.getString("PARENTDEPARTMENTID").equals("0")) { String sql1 = "SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE WSID='6f4e292c-1b90-4dd2-8c20-7da159cb20a5' and EXT1='" + org.getString("ID") + "'"; - String parentPalOrgId1 = DBSql.getString(open,sql1); + String parentPalOrgId1 = DBSql.getString(sql1); if(StringUtil.isEmpty(parentPalOrgId1)){ PALRepositoryModelImpl model1 = CoeProcessLevelUtil.createPALRepositoryModel(id1, plRid1, "6f4e292c-1b90-4dd2-8c20-7da159cb20a5", org.getString("DEPARTMENTNAME"), "", 1, parentModelId, "org", true, 1, @@ -104,8 +103,6 @@ public class SynchronousOrgJob implements IJob { return modelId=model1.getId(); } - DBSql.close(open); - } else { String parentPalOrgId = getParentPalOrgId(org); @@ -134,33 +131,28 @@ public class SynchronousOrgJob implements IJob { public String getParentPalOrgId(RowMap org) { - Connection open = DBSql.open(); String sql = "SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE WSID='6f4e292c-1b90-4dd2-8c20-7da159cb20a5' and EXT1='" + org.getString("PARENTDEPARTMENTID") + "'"; - String parentPalOrgId = DBSql.getString(open,sql); + String parentPalOrgId = DBSql.getString(sql); if (parentPalOrgId.equals("0") || parentPalOrgId.equals("") || parentPalOrgId == null) { RowMap parentOrg = DBSql.getMap("select DEPARTMENTNAME,ID,LAYER,PARENTDEPARTMENTID,ORDERINDEX from ORGDEPARTMENT where id = '" + org.getString("PARENTDEPARTMENTID") + "'"); creatNode(parentOrg); } - DBSql.close(open); - return parentPalOrgId; } public String getParentPallevel(RowMap org) { - Connection open = DBSql.open(); String sql = "SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE WSID='6f4e292c-1b90-4dd2-8c20-7da159cb20a5' and EXT1='" + org.getString("PARENTDEPARTMENTID") + "'"; - String parentPalOrgId = DBSql.getString(open,sql); + String parentPalOrgId = DBSql.getString(sql); if (parentPalOrgId.equals("0") || parentPalOrgId.equals("") || parentPalOrgId == null) { - RowMap parentOrg = DBSql.getMap(open,"select DEPARTMENTNAME,ID,LAYER,PARENTDEPARTMENTID from ORGDEPARTMENT where id = '" + org.getString("PARENTDEPARTMENTID") + "'"); + RowMap parentOrg = DBSql.getMap("select DEPARTMENTNAME,ID,LAYER,PARENTDEPARTMENTID from ORGDEPARTMENT where id = '" + org.getString("PARENTDEPARTMENTID") + "'"); creatNode(parentOrg); } - DBSql.close(open); return parentPalOrgId; } @@ -172,8 +164,6 @@ public class SynchronousOrgJob implements IJob { */ public void createPostData(String uuid,String departmentId,PALRepositoryModelImpl model){ - Connection open = DBSql.open(); - Map idRelationMap = new HashMap<>(); BaseModel defineModel = CoeDesignerAPIManager.getInstance().getDefinition(model.getId(), 0); @@ -196,8 +186,7 @@ public class SynchronousOrgJob implements IJob { } - - List orgdepartmentList=DBSql.getMaps(open,"select POSITION_NO,POSITION_NAME from ORGUSER WHERE DEPARTMENTID=?",departmentId); + List orgdepartmentList=DBSql.getMaps("select POSITION_NO,POSITION_NAME from ORGUSER WHERE DEPARTMENTID=?",departmentId); int zindex = 1; @@ -238,7 +227,6 @@ public class SynchronousOrgJob implements IJob { // 保存文件 CoeDesignerAPIManager.getInstance().storeDefinition(defineModel);// dao操作 - DBSql.close(open); } } diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java index 72370b74..51a46229 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java @@ -7785,7 +7785,8 @@ public class CoeProcessLevelWeb extends ActionWeb { } return flag; }) - .filter(item -> methodIdList.contains(((JSONObject)item).getString("plMethodId")) || "default".equals(((JSONObject)item).getString("plMethodId"))) + .filter(item -> methodIdList.contains(((JSONObject)item).getString("plMethodId")) + || "default".equals(((JSONObject)item).getString("plMethodId")) || "process.framework".equals(((JSONObject)item).getString("plMethodId"))) .collect(Collectors.toCollection(JSONArray::new)); } // 根据创建人过滤 @@ -8918,7 +8919,8 @@ public String deleteReply(String replyid, String messageid) { List recentList = CoeProcessLevelUtil.getRecentUpdateRepositoryList(wsId, teamId, _uc.getUID(), null, null, 30); // 伊利需求--【所选用户创建（作为“创建人”）的流程】与【当前用户所拥有流程权限】的交集 if (methodIdList.size() > 0) { - recentList = recentList.stream().filter(model -> methodIdList.contains(model.getMethodId())).collect(Collectors.toList()); + recentList = recentList.stream() + .filter(model -> methodIdList.contains(model.getMethodId()) || "process.framework".equals(model.getMethodId())).collect(Collectors.toList()); } if (createUserList.size() > 0) { recentList = recentList.stream().filter(model -> createUserList.contains(model.getCreateUser())).collect(Collectors.toList()); @@ -9306,7 +9308,8 @@ public String deleteReply(String replyid, String messageid) { } return flag; }) - .filter(item -> methodIdList.contains(((JSONObject)item).getString("methodId")) || "default".equals(((JSONObject)item).getString("methodId"))) + .filter(item -> methodIdList.contains(((JSONObject)item).getString("methodId")) + || "default".equals(((JSONObject)item).getString("methodId")) || "process.framework".equals(((JSONObject)item).getString("methodId"))) .collect(Collectors.toCollection(JSONArray::new)); } // 根据创建人过滤