diff --git a/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar b/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar index f64f704a..1ceb5890 100644 Binary files a/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar and b/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar differ diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java index c1453b5f..377b767e 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java @@ -4654,45 +4654,57 @@ public class ProcessPublishWeb extends ActionWeb { if (processInstance.getProcessDefId().equals("obj_fb1c7a54b98b412187388c8bab407362") || processInstance.getProcessDefId().equals("obj_5609e1d265dc4e7094c617f20be353dd") ) { //l1 l2 l3 l4 保存到表里 DBSql.update(String.format("update BO_ACT_COE_PUBLISH set LEVEL_1_PROCESS_NAME='%s',LEVEL_2_PROCESS_NAME='%s',LEVEL_3_PROCESS_NAME='%s' where BINDID='%s'", level1, level2, level3, bindid)); - String sql = "select AUDITOR1,AUDITOR_NO_1,L1_SP,AUDITOR2,AUDITOR_NO_2,L2_SP,AUDITOR3,AUDITOR_NO_3,L3_SP from BO_ACT_AUTH_INFO where LEVEL_1_PROCESS_NAME='%s' and LEVEL_2_PROCESS_NAME='%s' and LEVEL_3_PROCESS_NAME='%s' and ORGNAME='%s' and ADAPT_REGION_NAME='%s' and APPLICABLE_PRODUCT='%s'"; - RowMap result = DBSql.getMap(String.format(sql, level1, level2, level3, company, region, product)); + ResponseObject ro = ResponseObject.newOkResponse(); - ro.put("data", result == null ? "" : result); + //查询区域流程 List adaptRowMap = DBSql.getMaps("select ADAPT_REGION_NAME from BO_ACT_AUTH_INFO where LEVEL_1_PROCESS_NAME=? AND LEVEL_2_PROCESS_NAME=? AND LEVEL_3_PROCESS_NAME=? AND ADAPT_NAME_THE_COMPANY=?", level1, level2, level3,region); if(adaptRowMap.size()>0){ ro.put("ADAPT_REGION_NAME",adaptRowMap.get(0).getString("ADAPT_REGION_NAME")); + region=adaptRowMap.get(0).getString("ADAPT_REGION_NAME"); } //查询产品流程 List applicableRowMap = DBSql.getMaps("select APPLICABLE_PRODUCT from BO_ACT_AUTH_INFO where LEVEL_1_PROCESS_NAME=? AND LEVEL_2_PROCESS_NAME=? AND LEVEL_3_PROCESS_NAME=? AND ADAPT_NAME_THE_COMPANY=? ", level1, level2, level3,region); if(adaptRowMap.size()>0){ ro.put("APPLICABLE_PRODUCT",applicableRowMap.get(0).getString("APPLICABLE_PRODUCT")); + product=applicableRowMap.get(0).getString("APPLICABLE_PRODUCT"); } + String sql = "select AUDITOR1,AUDITOR_NO_1,L1_SP,AUDITOR2,AUDITOR_NO_2,L2_SP,AUDITOR3,AUDITOR_NO_3,L3_SP from BO_ACT_AUTH_INFO where LEVEL_1_PROCESS_NAME='%s' and LEVEL_2_PROCESS_NAME='%s' and LEVEL_3_PROCESS_NAME='%s' and ORGNAME='%s' and ADAPT_REGION_NAME='%s' and APPLICABLE_PRODUCT='%s'"; + RowMap result = DBSql.getMap(String.format(sql, level1, level2, level3, company, region, product)); + + ro.put("data", result == null ? "" : result); + return ro.toString(); } else { //l1 l2 l3 l4 保存到表里 DBSql.update(String.format("update BO_ACT_COE_PUBLISH set LEVEL_1_PROCESS_NAME='%s',LEVEL_2_PROCESS_NAME='%s',LEVEL_3_PROCESS_NAME='%s',LEVEL_4_PROCESS_NAME='%s' where BINDID='%s'", level1, level2, level3, level4, bindid)); - String sql = "select AUDITOR1,AUDITOR_NO_1,L1_SP,AUDITOR2,AUDITOR_NO_2,L2_SP,AUDITOR3,AUDITOR_NO_3,L3_SP,AUDITOR4,AUDITOR_NO_4,L4_SP from BO_ACT_AUTH_INFO where LEVEL_1_PROCESS_NAME='%s' and LEVEL_2_PROCESS_NAME='%s' and LEVEL_3_PROCESS_NAME='%s' and LEVEL_4_PROCESS_NAME='%s' and ORGNAME='%s' and ADAPT_REGION_NAME='%s' and APPLICABLE_PRODUCT='%s'"; - RowMap result = DBSql.getMap(String.format(sql, level1, level2, level3, level4, company, region, product)); + ResponseObject ro = ResponseObject.newOkResponse(); - ro.put("data", result == null ? "" : result); + //查询区域流程 List adaptRowMap = DBSql.getMaps("select ADAPT_REGION_NAME from BO_ACT_AUTH_INFO where LEVEL_1_PROCESS_NAME=? AND LEVEL_2_PROCESS_NAME=? AND LEVEL_3_PROCESS_NAME=? AND LEVEL_4_PROCESS_NAME=? AND ORGNAME=?", level1, level2, level3,level4,company); if(adaptRowMap.size()>0){ ro.put("ADAPT_REGION_NAME",adaptRowMap.get(0).getString("ADAPT_REGION_NAME")); + region=adaptRowMap.get(0).getString("ADAPT_REGION_NAME"); } //查询产品流程 List applicableRowMap = DBSql.getMaps("select APPLICABLE_PRODUCT from BO_ACT_AUTH_INFO where LEVEL_1_PROCESS_NAME=? AND LEVEL_2_PROCESS_NAME=? AND LEVEL_3_PROCESS_NAME=? AND LEVEL_4_PROCESS_NAME=? AND ORGNAME=?", level1, level2, level3,level4,company); if(adaptRowMap.size()>0){ ro.put("APPLICABLE_PRODUCT",applicableRowMap.get(0).getString("APPLICABLE_PRODUCT")); + product=applicableRowMap.get(0).getString("APPLICABLE_PRODUCT"); } + String sql = "select AUDITOR1,AUDITOR_NO_1,L1_SP,AUDITOR2,AUDITOR_NO_2,L2_SP,AUDITOR3,AUDITOR_NO_3,L3_SP,AUDITOR4,AUDITOR_NO_4,L4_SP from BO_ACT_AUTH_INFO where LEVEL_1_PROCESS_NAME='%s' and LEVEL_2_PROCESS_NAME='%s' and LEVEL_3_PROCESS_NAME='%s' and LEVEL_4_PROCESS_NAME='%s' and ORGNAME='%s' and ADAPT_REGION_NAME='%s' and APPLICABLE_PRODUCT='%s'"; + RowMap result = DBSql.getMap(String.format(sql, level1, level2, level3, level4, company, region, product)); + + ro.put("data", result == null ? "" : result); + return ro.toString(); }