diff --git a/com.actionsoft.apps.coe.pal.cooperation/lib/com.actionsoft.apps.coe.pal.cooperation.jar b/com.actionsoft.apps.coe.pal.cooperation/lib/com.actionsoft.apps.coe.pal.cooperation.jar index 12a703c7..366ba376 100644 Binary files a/com.actionsoft.apps.coe.pal.cooperation/lib/com.actionsoft.apps.coe.pal.cooperation.jar and b/com.actionsoft.apps.coe.pal.cooperation/lib/com.actionsoft.apps.coe.pal.cooperation.jar differ diff --git a/com.actionsoft.apps.coe.pal.cooperation/src/com/actionsoft/apps/coe/pal/cooperation/CooperationQueryAPIManager.java b/com.actionsoft.apps.coe.pal.cooperation/src/com/actionsoft/apps/coe/pal/cooperation/CooperationQueryAPIManager.java index 765a4356..63b1e8cb 100644 --- a/com.actionsoft.apps.coe.pal.cooperation/src/com/actionsoft/apps/coe/pal/cooperation/CooperationQueryAPIManager.java +++ b/com.actionsoft.apps.coe.pal.cooperation/src/com/actionsoft/apps/coe/pal/cooperation/CooperationQueryAPIManager.java @@ -111,12 +111,13 @@ public class CooperationQueryAPIManager { // 获取符合权限的子流程 List childrenList = getUsedPalRepositoryModelsByPidNew(wsId, teamId, pid); CooperationUtil.sortByLevelAndOrderIndex(childrenList); - Map grandChildrenCountMap = new HashMap<>(); - for (PALRepositoryModel chlidModel : childrenList) { - List grandChildrenList = getUsedPalRepositoryModelsByPidNew(wsId, teamId, chlidModel.getId()); - grandChildrenCountMap.put(chlidModel.getId(), grandChildrenList.size()); - } - JSONArray result = list2JsonNew(childrenList, grandChildrenCountMap); + + // Map grandChildrenCountMap = new HashMap<>(); + // for (PALRepositoryModel chlidModel : childrenList) { + // List grandChildrenList = getUsedPalRepositoryModelsByPidNew(wsId, teamId, chlidModel.getId()); + // grandChildrenCountMap.put(chlidModel.getId(), grandChildrenList.size()); + // } + JSONArray result = list2JsonNew(childrenList); return result; } @@ -188,7 +189,7 @@ public class CooperationQueryAPIManager { * @param childrenCountMap list中的model是否具有子节点map记录 * @return */ - private JSONArray list2JsonNew(List list, Map childrenCountMap) { + private JSONArray list2JsonNew(List list) { JSONArray jsonArray = new JSONArray(); for (PALRepositoryModel model : list) { JSONObject object = new JSONObject(); @@ -216,7 +217,7 @@ public class CooperationQueryAPIManager { } object.put("icon", icon); List children = null; - if (childrenCountMap.containsKey(model.getId()) && childrenCountMap.get(model.getId()) > 0) { + if (PALRepositoryCache.getByPid(model.getWsId(), model.getId()).hasNext()) { object.put("leaf", false);// 非叶子节点 } else { object.put("leaf", true);// 叶子节点 diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.processlevel.create.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.processlevel.create.js index b4eac891..487968b3 100755 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.processlevel.create.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.processlevel.create.js @@ -820,6 +820,11 @@ function openTextareaDialog(obj, title,id) { if (parent.isParentShow) { parent.$("#textarea-dialog textarea").val(obj.val()); parent.$("#textarea-dialog").attr("title", title); + // 只读 + if (id){ + var textarea = parent.$('#textarea-dialog textarea'); + textarea.prop('readonly', true); + } // parent.$("#textarea-dialog textarea").blur(); parent.$("#textarea-dialog").dialog({ draggable: true, @@ -849,6 +854,11 @@ function openTextareaDialog(obj, title,id) { } else { $("#textarea-dialog textarea").val(obj.val()); $("#textarea-dialog").attr("title", title); + // 只读 + if (id){ + var textarea = $('#textarea-dialog textarea'); + textarea.prop('readonly', true); + } // $("#textarea-dialog textarea").blur(); $("#textarea-dialog").dialog({ buttons : [{ diff --git a/com.awspaas.user.apps.docview/src/com/awspaas/user/apps/docview/DocumentsToReadController.java b/com.awspaas.user.apps.docview/src/com/awspaas/user/apps/docview/DocumentsToReadController.java index ea9f7b1a..365b4811 100644 --- a/com.awspaas.user.apps.docview/src/com/awspaas/user/apps/docview/DocumentsToReadController.java +++ b/com.awspaas.user.apps.docview/src/com/awspaas/user/apps/docview/DocumentsToReadController.java @@ -113,14 +113,14 @@ public class DocumentsToReadController { return HtmlPageTemplate.merge("com.awspaas.user.apps.docview", html, map); } private void setArrayWfc(String fileId,JSONArray jsonArray,String uid) { - String sqlAll = "SELECT * FROM BO_EU_PAL_DOC_VIEW WHERE ID = '"+fileId+"'"; + String sqlAll = "SELECT FILEID,FILENAME,FILEURL,FILECREATEDATE FROM BO_EU_PAL_DOC_VIEW WHERE ID = '"+fileId+"'"; List map1 = DBSql.getMaps(sqlAll); if (map1.size()!=0) { getWFC(jsonArray, map1, uid); } } private void setArrayWfh(String fileId,JSONArray jsonArray,String uid) { - String sqlAll = "SELECT * FROM BO_EU_PAL_DOC_VIEW WHERE ID = '"+fileId+"'"; + String sqlAll = "SELECT FILEID,FILENAME,FILEURL,FILECREATEDATE FROM BO_EU_PAL_DOC_VIEW WHERE ID = '"+fileId+"'"; List map1 = DBSql.getMaps(sqlAll); if (map1.size()!=0) { getWFH(jsonArray, map1, uid); @@ -228,7 +228,7 @@ public class DocumentsToReadController { public JSONArray getWFC(JSONArray jsonArray, List maps, String uid) { for (RowMap rowMap : maps) { String id = rowMap.getString("FILEID"); - String sqlt = "SELECT * FROM BO_EU_PAL_RECORD WHERE FILEID = ? AND READFILENAME =?"; + String sqlt = "SELECT ID FROM BO_EU_PAL_RECORD WHERE FILEID = ? AND READFILENAME =?"; RowMap mapt = DBSql.getMap(sqlt, new Object[] { id, uid }); if (mapt == null) { JSONObject jsonObject = new JSONObject(); @@ -333,7 +333,7 @@ public class DocumentsToReadController { for (RowMap rowMap : maps) { String id = rowMap.getString("FILEID"); String fileName = rowMap.getString("FILENAME"); - RowMap map = DBSql.getMap("SELECT * FROM BO_ACT_DATAID WHERE READSTATE = '已读' AND TITLE LIKE '%"+fileName+"%' AND USER_ID = '"+uid+"'"); + RowMap map = DBSql.getMap("SELECT ID FROM BO_ACT_DATAID WHERE READSTATE = '已读' AND TITLE LIKE '%"+fileName+"%' AND USER_ID = '"+uid+"'"); if(map!=null) { JSONObject jsonObject = new JSONObject(); String fileUrl = rowMap.getString("FILEURL"); @@ -356,7 +356,7 @@ public class DocumentsToReadController { for (RowMap rowMap : maps) { try { String id = rowMap.getString("FILEID"); - String sqlt = "SELECT * FROM BO_EU_PAL_RECORD WHERE FILEID = ? AND READFILENAME =?"; + String sqlt = "SELECT ID FROM BO_EU_PAL_RECORD WHERE FILEID = ? AND READFILENAME =?"; RowMap mapt = DBSql.getMap(sqlt, new Object[] { id, uid }); if (mapt != null) { JSONObject jsonObject = new JSONObject(); @@ -395,7 +395,7 @@ public class DocumentsToReadController { String fileName = split[1]; String uid = UserContext.fromSessionId(sid).getUID(); System.err.println("阅读文件===========》"+uid); - String sql = "SELECT * FROM BO_EU_PAL_RECORD WHERE FILEID = ? AND READFILENAME = ?"; + String sql = "SELECT READFILECOUNT FROM BO_EU_PAL_RECORD WHERE FILEID = ? AND READFILENAME = ?"; RowMap map = DBSql.getMap(sql, new Object[] { id, uid }); int num = 0; if (null != map) { diff --git a/com.awspaas.user.apps.yili.integration/src/com/awspaas/user/apps/integration/oauth/TaskController.java b/com.awspaas.user.apps.yili.integration/src/com/awspaas/user/apps/integration/oauth/TaskController.java index 657023f7..559becb7 100644 --- a/com.awspaas.user.apps.yili.integration/src/com/awspaas/user/apps/integration/oauth/TaskController.java +++ b/com.awspaas.user.apps.yili.integration/src/com/awspaas/user/apps/integration/oauth/TaskController.java @@ -740,8 +740,8 @@ public class TaskController { //门户待阅同步更新 public String setRecord(String uid, String id, String fileName) { - String sql = "SELECT * FROM BO_EU_PAL_RECORD WHERE FILEID = ? AND READFILENAME = ?"; - RowMap map = DBSql.getMap(sql, new Object[]{id, uid}); + String sql = "SELECT READFILECOUNT FROM BO_EU_PAL_RECORD WHERE FILEID = ? AND READFILENAME = ?"; + RowMap map= DBSql.getMap(sql, new Object[]{id, uid}); int num = 0; if (null != map) { String readCount = map.getString("READFILECOUNT"); diff --git a/com.awspaas.user.apps.yili.reportform/lib/com.awspaas.user.apps.yili.reportform.jar b/com.awspaas.user.apps.yili.reportform/lib/com.awspaas.user.apps.yili.reportform.jar index e798ce82..d9e8d12f 100644 Binary files a/com.awspaas.user.apps.yili.reportform/lib/com.awspaas.user.apps.yili.reportform.jar and b/com.awspaas.user.apps.yili.reportform/lib/com.awspaas.user.apps.yili.reportform.jar differ 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 f925ed01..f55d77a3 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 @@ -325,7 +325,7 @@ public class DataViewService extends ActionWeb { ro.put("nodes", UoPProcessMaps); linksMaps = new LinkedList(); ro.put("links", linksMaps); - ro.info("您所查询的岗位暂无需执行的流程"); + ro.info("您所在的组织，暂无配置可发起的流程"); } else { for (Map uoPProcessMap : UoPProcessMaps) { @@ -581,7 +581,7 @@ public class DataViewService extends ActionWeb { ro.put("nodes", UoPProcessMaps); linksMaps = new LinkedList(); ro.put("links", linksMaps); - ro.info("您所查询的岗位暂无需执行的流程"); + ro.info("您所在的组织，暂无配置可发起的流程"); } } @@ -1452,7 +1452,7 @@ public class DataViewService extends ActionWeb { ro.put("nodes", UoPProcessMaps); linksMaps = new LinkedList(); ro.put("links", linksMaps); - ro.info("您所查询的岗位暂无需执行的流程"); + ro.info("您所在的组织，暂无配置可发起的流程"); } }