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 21498fe8..10245ad1 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/dao/PALRepositoryRemoveInfo.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/dao/PALRepositoryRemoveInfo.java index 3bca2747..8735f39a 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/dao/PALRepositoryRemoveInfo.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/dao/PALRepositoryRemoveInfo.java @@ -14,6 +14,7 @@ import com.actionsoft.bpms.commons.database.RowMapper; import com.actionsoft.bpms.commons.mvc.dao.DaoObject; import com.actionsoft.bpms.commons.mvc.view.ResponseObject; import com.actionsoft.bpms.commons.pagination.SQLPagination; +import com.actionsoft.bpms.org.model.UserModel; import com.actionsoft.bpms.server.SSOUtil; import com.actionsoft.bpms.server.UserContext; import com.actionsoft.bpms.server.conf.server.AWSServerConf; @@ -624,8 +625,21 @@ public class PALRepositoryRemoveInfo extends DaoObject()); - JSONObject jsonObject = new JSONObject(new LinkedHashMap<>()); - jsonObject.put("documentId", id); - jsonObject.put("content", "");//信息附件 - //jsonObject.put("abstract", dcContext);//信息摘要 - jsonObject.put("title", card_name.substring(0,card_name.indexOf("V")));//信息标题 - coontest.add(jsonObject); - createIndexesByContent(sourceAppId,coontest); + if(UtilString.isNotEmpty(card_name)){ + JSONArray coontest = new JSONArray(new LinkedList<>()); + JSONObject jsonObject = new JSONObject(new LinkedHashMap<>()); + jsonObject.put("documentId", id); + jsonObject.put("content", "");//信息附件 + //jsonObject.put("abstract", dcContext);//信息摘要 + jsonObject.put("title", card_name.substring(0,card_name.indexOf("V")));//信息标题 + coontest.add(jsonObject); + createIndexesByContent(sourceAppId,coontest); + } + + } 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 688c250d..4d5c99ba 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 @@ -8434,7 +8434,9 @@ public class CoeProcessLevelWeb extends ActionWeb { methodObj.put("havingCreatePerm", false); } else if (model.getId().equals("process.framework") && !_uc.getUID().equals("admin")) { methodObj.put("havingCreatePerm", false); - } else { + } else if(model.getId().equals("engineering.standard") && model.getSchema().contains("工程技术标准")){ + methodObj.put("havingCreatePerm", true); + }else { methodObj.put("havingCreatePerm", PALMethodManager.getInstance().havingCreateMethodPerm(category, methodId, c, model.getId())); } diff --git a/com.actionsoft.apps.coe.pal/template/page/pal.pl.level.upfile.portal.htm b/com.actionsoft.apps.coe.pal/template/page/pal.pl.level.upfile.portal.htm index 6b3b3f82..99ea80be 100755 --- a/com.actionsoft.apps.coe.pal/template/page/pal.pl.level.upfile.portal.htm +++ b/com.actionsoft.apps.coe.pal/template/page/pal.pl.level.upfile.portal.htm @@ -99,7 +99,7 @@ 选择文件
- 附件格式支持:jpg, jpeg, gif, png, bmp, pdf, doc, docx, ppt, pptx, xls, xlsx, txt, mp3, mp4, avi, mpeg, flv, swf, wmv, xml, rtf,zip,rar + 附件格式支持:jpg, jpeg, gif, png, bmp, pdf, doc, docx, ppt, pptx, xls, xlsx, txt, mp3, mp4, avi, mpeg, flv, swf, wmv, xml, rtf,zip,rar,dwg
diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.pl.upfile.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.pl.upfile.js index 275c90d9..1162544c 100755 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.pl.upfile.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.pl.upfile.js @@ -71,7 +71,7 @@ $(function() { fileValue:fileValue, // filesToFilter: [["Images (*.jpg; *.jpeg; *.gif; *.png; *.bmp)","Document (*.doc;*.docx;*.xls;*.xlsx;*.ppt;*.pptx;*.pdf;)", "*.jpg; *.jpeg; *.gif; *.png; *.bmp; *.pdf; *.doc; *.docx; *.xls; *.xlsx; *.ppt; *.pptx; *.txt"]], filesToFilter: [["Images (*.jpg; *.jpeg; *.gif; *.png; *.bmp),Document (*.doc;*.docx;*.xls;*.xlsx;*.ppt;*.pptx;*.pdf;), Video (*.mp3; *.mp4; *.avi; *.mpeg; *.flv; *.swf; *.wmv)", - "*.jpg; *.jpeg; *.gif; *.png; *.bmp; *.pdf; *.doc; *.docx; *.xls; *.xlsx; *.ppt; *.pptx; *.txt,*.mp3; *.mp4; *.avi; *.mpeg; *.flv; *.swf; *.wmv; *.xml; *.rtf;*.zip;*.rar;"]], + "*.jpg; *.jpeg; *.gif; *.png; *.bmp; *.pdf; *.doc; *.docx; *.xls; *.xlsx; *.ppt; *.pptx; *.txt,*.mp3; *.mp4; *.avi; *.mpeg; *.dwg;*.flv; *.swf; *.wmv; *.xml; *.rtf;*.zip;*.rar;"]], repositoryName: repositoryName, numLimit : 0, sizeLimit : 500 * 1024 * 1024,