yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

回收站判断注销用户/工程标准图展示/上传文件增加dwg格式

Browse Source
This commit is contained in:
zhal 2024-06-12 17:51:17 +08:00
parent ab3c8b735e
commit c362bbd17e
5 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar
View File

Binary file not shown.

36
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/dao/PALRepositoryRemoveInfo.java
View File

@ -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<PALRepositoryRemoveInfoMo
PALRepositoryModelImpl models = (PALRepositoryModelImpl) model;
SSOUtil ssoUtil = new SSOUtil();
String sessionId = ssoUtil.registerClientSessionNoPassword(models.getCreateUser(), "cn",SDK.getPortalAPI().getPortalUrl(), "pc");
UserModel user = SDK.getORGAPI().getUser(models.getCreateUser());
String sessionId;
System.out.println("model.getMethodId()"+model.getMethodId());
System.out.println(model.getMethodId().equals("process.framework"));
if(!user.isClosed()){
sessionId = ssoUtil.registerClientSessionNoPassword(models.getCreateUser(), "cn",SDK.getPortalAPI().getPortalUrl(), "pc");
}else{
sessionId = ssoUtil.registerClientSessionNoPassword("admin", "cn",SDK.getPortalAPI().getPortalUrl(), "pc");
}
PublishKnow(CoEConstant.APP_ID,UserContext.fromUID(models.getCreateUser()),models.getExt4(),sessionId,model.getParentId());
}
}
@ -762,14 +776,18 @@ public class PALRepositoryRemoveInfo extends DaoObject<PALRepositoryRemoveInfoMo
// 发布知识
ResponseObject ro = appAPI.callASLP(appAPI.getAppContext(sourceAppId), aslp, params);
String card_name = DBSql.getString("SELECT CARDNAME FROM APP_ACT_KMS_CARD WHERE ID = '" + id + "'");
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);
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);
}
}

4
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java
View File

@ -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()));
}

2
com.actionsoft.apps.coe.pal/template/page/pal.pl.level.upfile.portal.htm
View File

@ -99,7 +99,7 @@
<!-- <input style="width:350px;float:left;" id="upfileAccessoryName" readonly="readonly" type="text" class="awsui-input">-->
<span style="float:left;" id="upfile" class="button blue" onclick="return false;">选择文件</span>
<div style="padding: 5px; font-size: 12px; color: rgb(120, 120, 120);display: inline-block;">
<span style="word-break:keep-all;">附件格式支持:jpg, jpeg, gif, png, bmp, pdf, doc, docx, ppt, pptx, xls, xlsx, txt, mp3, mp4, avi, mpeg, flv, swf, wmv, xml, rtf,zip,rar</span>
<span style="word-break:keep-all;">附件格式支持: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</span>
</div>
</div>
</div>

2
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.pl.upfile.js
View File

@ -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,