diff --git a/com.actionsoft.apps.coe.pal.output.or/src/com/actionsoft/apps/coe/pal/output/or/ReportORController.java b/com.actionsoft.apps.coe.pal.output.or/src/com/actionsoft/apps/coe/pal/output/or/ReportORController.java index 2a500885..a1a2bb8c 100644 --- a/com.actionsoft.apps.coe.pal.output.or/src/com/actionsoft/apps/coe/pal/output/or/ReportORController.java +++ b/com.actionsoft.apps.coe.pal.output.or/src/com/actionsoft/apps/coe/pal/output/or/ReportORController.java @@ -76,7 +76,7 @@ public class ReportORController { //_dfa1e6b810b408b8654f14f9c0312386 //,2a45196f-f46a-48b3-9cdc-9f509da4dfde profileId ="_dfa1e6b810b408b8654f14f9c0312386"; - relationFileId =",32d7f96a-87f3-4b2f-a310-b5d2822adf1e"; + relationFileId =",a721f3c0-3d67-4f5d-8a31-b2c1c5f01301"; } String isExecute = "N"; String config = "{'isItReport':true,'orderNuberFirst':true,'orderNametwo':false,'reportNameIsItName':'%shapeName%'}"; diff --git a/com.actionsoft.apps.coe.pal.output.or/src/com/actionsoft/apps/coe/pal/output/or/report2/Report2Gener.java b/com.actionsoft.apps.coe.pal.output.or/src/com/actionsoft/apps/coe/pal/output/or/report2/Report2Gener.java index 650492df..0ecea5f2 100644 --- a/com.actionsoft.apps.coe.pal.output.or/src/com/actionsoft/apps/coe/pal/output/or/report2/Report2Gener.java +++ b/com.actionsoft.apps.coe.pal.output.or/src/com/actionsoft/apps/coe/pal/output/or/report2/Report2Gener.java @@ -90,12 +90,7 @@ public class Report2Gener { // ----文件处理----- String targetFileIds = jsonObj.getString("targetFileId"); if (!UtilString.isEmpty(targetFileIds)) { - if (isJsonArray(targetFileIds)) { - JSONArray array = JSONArray.parseArray(targetFileIds); - genarateWord(tempPath, tempName, dcContext.getPath(), jsonObj, array,userId); - } else { genarateWord(tempPath, tempName, dcContext.getPath(), jsonObj,userId); - } } log.info("end"); } @@ -239,10 +234,6 @@ public class Report2Gener { for (int q =0;q< lists.size();q++){ - - - - //流程表格 JSONArray repositoryTable = new JSONArray(); //相关流程 diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishFormBeforeSaveEvent.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishFormBeforeSaveEvent.java index fadfb5fd..d5b5c061 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishFormBeforeSaveEvent.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishFormBeforeSaveEvent.java @@ -284,7 +284,7 @@ public class PublishFormBeforeSaveEvent extends InterruptListener implements Int } String from_id = from.getString("id"); String to_id = to.getString("id"); - if (UtilString.isEmpty(from_id)||UtilString.isEmpty(to_id)){ + if (UtilString.isEmpty(from_id)&&UtilString.isEmpty(to_id)){ throw new BPMNError("0313", "出入线未与其他形状进行关联,请查看模型,连线校验未通过!!!"); } if (UtilString.isNotEmpty(from_id)) { 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 672a5793..1e94f29b 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 @@ -9480,7 +9480,7 @@ public class CoeProcessLevelWeb extends ActionWeb { SDK.getLogAPI().consoleInfo("to>>>>>>>>>>>"+to); String from_id = from.getString("id"); String to_id = to.getString("id"); - if(UtilString.isEmpty(from_id)||UtilString.isEmpty(to_id)){ + if(UtilString.isEmpty(from_id)&&UtilString.isEmpty(to_id)){ sb.append("连线校验
"); sb6.append("出入线未与其他形状进行关联,请查看模型"); sb6.append("校验未通过,请检查模型是否都已连线!"); diff --git a/com.awspaas.user.apps.yili.reportform/src/com/awspaas/user/apps/yili/reportform/service/DataViewService.java b/com.awspaas.user.apps.yili.reportform/src/com/awspaas/user/apps/yili/reportform/service/DataViewService.java index 60867b66..493feac1 100644 --- a/com.awspaas.user.apps.yili.reportform/src/com/awspaas/user/apps/yili/reportform/service/DataViewService.java +++ b/com.awspaas.user.apps.yili.reportform/src/com/awspaas/user/apps/yili/reportform/service/DataViewService.java @@ -1664,18 +1664,18 @@ public class DataViewService extends ActionWeb { String dept = ""; for (String depart: departList) { - dept = dept.concat("REGEXP_LIKE(EXT6, "+depart+")").concat(" OR "); + dept = dept.concat("REGEXP_LIKE(ORGPERM, "+depart+")").concat(" OR "); } - dept = dept.concat("EXT6 = 'all' "); + dept = dept.concat("PERMTYPE = '1' "); String departSql =dept; SDK.getLogAPI().consoleInfo("部门sql输出的是什么>>>>>>>>>>"+departSql); try { List maps = null; if (json.size() < 450) { - String sqltt = "SELECT ID AS FILEID,PLNAME,PLPARENTID,PLMETHODID,PLLEVEL,PLVERSIONID,PLORDERINDEX,EXT3 as POLICYTYPE FROM APP_ACT_COE_PAL_REPOSITORY WHERE ISPUBLISH = 1 AND EXT5 = '1' AND "+departSql+" AND PLMETHODID in ('process.epc','control.policy','process.flowchart')"; + String sqltt = "SELECT ID AS FILEID,PLNAME,PLPARENTID,PLMETHODID,PLLEVEL,PLVERSIONID,PLORDERINDEX,EXT3 as POLICYTYPE FROM APP_ACT_COE_PAL_REPOSITORY WHERE ISPUBLISH = 1 AND EXT5 = '1' AND PLVERSIONID IN (select PALVERSIONID from BO_ACT_PUBLISH_PERM_SCOPE where "+departSql+" ) AND PLMETHODID in ('process.epc','control.policy','process.flowchart')"; maps = DBSql.getMaps(sqltt); } else { - String sqltt = "SELECT ID AS FILEID,PLNAME,PLPARENTID,PLMETHODID,PLLEVEL,PLVERSIONID,PLORDERINDEX,EXT3 as POLICYTYPE FROM APP_ACT_COE_PAL_REPOSITORY WHERE ISPUBLISH = 1 AND ISSTOP =0 AND EXT5 = '1' AND EXT6 IS NOT NULL AND PLMETHODID in ('process.epc','control.policy','process.flowchart')"; + String sqltt = "SELECT ID AS FILEID,PLNAME,PLPARENTID,PLMETHODID,PLLEVEL,PLVERSIONID,PLORDERINDEX,EXT3 as POLICYTYPE FROM APP_ACT_COE_PAL_REPOSITORY WHERE ISPUBLISH = 1 AND ISSTOP =0 AND EXT5 = '1' PLVERSIONID IN (select PALVERSIONID from BO_ACT_PUBLISH_PERM_SCOPE where ORGPERM IS NOT NULL OR PERMTYPE = '1') AND PLMETHODID in ('process.epc','control.policy','process.flowchart')"; maps = DBSql.getMaps(sqltt); } for (RowMap rowMap : maps) {