diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/PublisherController.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/PublisherController.java index fd4ae267..a6b7a2ad 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/PublisherController.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/PublisherController.java @@ -760,6 +760,9 @@ public class PublisherController { return publishWeb.getLevelByData(me,wsId,datas); } + + + /** * 根据矩阵信息查询审批信息 * @param me 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 954875e3..ebedda59 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 @@ -20,6 +20,7 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; +import com.actionsoft.apps.coe.pal.system.util.StringUtil; import org.apache.commons.lang.StringUtils; import com.actionsoft.apps.coe.pal.constant.CoEConstant; @@ -4228,11 +4229,27 @@ public class ProcessPublishWeb extends ActionWeb { result.put(key, value); } } + + /* + 根据L1、L2、L3查询权限矩阵所属分部数据 + */ + String sql = "SELECT SSFB FROM BO_ACT_AUTH_INFO WHERE LEVEL_1_PROCESS_NAME=? AND LEVEL_2_PROCESS_NAME=? AND LEVEL_3_PROCESS_NAME=?"; + String ssfb = DBSql.getString(sql, new Object[] { result.getString("Process_Architecture_L1"),result.getString("Process_Architecture_L2"),result.getString("Process_Architecture_L3") }); + + if(StringUtils.isNotEmpty(ssfb)){ + ro.put("ssfb",ssfb); + } + ro.put("data", result); ro.put("info", iswrong); return ro.toString(); } + + + + + /** * 全部根据中文去找 * 根据表单内容 获取权限矩阵的审批人 diff --git a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js index 0eff9a63..418fcfc3 100644 --- a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js +++ b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js @@ -456,7 +456,6 @@ function initPublishData(data, type, pageNumber, start){ // 初始化数据 function selectPublishData(data, type, pageNumber, start) { - //渲染到前台的流程架构L1,L2,L3 var param = { cmd: 'com.actionsoft.apps.coe.pal.publisher_getPublishNameByJs', @@ -476,6 +475,7 @@ function selectPublishData(data, type, pageNumber, start) { var L1 = r.data.data.Process_Architecture_L1; var L2 = r.data.data.Process_Architecture_L2; var L3 = r.data.data.Process_Architecture_L3; + var ssfb=r.data.ssfb; var L1old = ui("LEVEL_1_PROCESS_NAME"); var L2old = ui("LEVEL_2_PROCESS_NAME"); var L3old = ui("LEVEL_3_PROCESS_NAME"); @@ -483,6 +483,8 @@ function selectPublishData(data, type, pageNumber, start) { ui("LEVEL_1_PROCESS_NAME",L1); ui("LEVEL_2_PROCESS_NAME",L2); ui("LEVEL_3_PROCESS_NAME",L3); + ui("SSFB",ssfb); + showlist(data, type, pageNumber, start); //发起请求把审批人查询出来~ queryapprove(); @@ -567,8 +569,8 @@ function showlist(data, type, pageNumber, start){ var upName = json.upFileName; var openUrl = json.openUrl; var downUrl = json.downUrl; - fName += '

' + upName + ' 

'; - } + fName += '

' + upName+"xxxx" + ' 

'; + } } var fileName = curr.publishFileName + ' V' + curr.fileVersion; debugger; @@ -881,6 +883,7 @@ function addProcess(type) { //initPublishData(newTemp, type, newPageSetting.pageNumber, newPageSetting.start); selectPublishData(newTemp, type, newPageSetting.pageNumber, newPageSetting.start); } + //$("#publisher_dialog").dialog("close"); $.simpleAlert('close'); }, 200); @@ -1264,7 +1267,6 @@ function loadNewData(treeNode) { // 发布类型批量结果数据回填主dialog function getNewPublishBatchResult(type) { - debugger; var nodes = initTree.getCheckedNodes(); treeCheckedNewArr = []; var param = { @@ -1274,7 +1276,6 @@ function getNewPublishBatchResult(type) { sid: sid, datas:JSON.stringify(nodes) }; - $.ajax({ url : "./jd", type : "POST", @@ -1286,6 +1287,7 @@ function getNewPublishBatchResult(type) { var L1 = r.data.data.Process_Architecture_L1; var L2 = r.data.data.Process_Architecture_L2; var L3 = r.data.data.Process_Architecture_L3; + var ssfb=r.data.ssfb; var L1old = ui("LEVEL_1_PROCESS_NAME"); var L2old = ui("LEVEL_2_PROCESS_NAME"); var L3old = ui("LEVEL_3_PROCESS_NAME");