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

Compare commits

base: yili:241c255ae0d716ab0b7a6b4dc1e89aa9696e8aa3
Branches Tags
yili:master
yili:apps_4_test
yili:apps_dev
yili:apps_dev_ydq_portal_home
yili:apps_dev_ydq_portal_process
yili:apps_dev_ydq_portal_person
yili:apps_dev_ydq_sjdb
yili:apps_dev_ydq_portal_dept
yili:apps_zhaolei_dev
yili:apps_dev_ydq_process_list
yili:apps_dev_ydq_oa_dyAndYy
yili:apps_dev_CEO_whitelist
yili:apps_dev_ydq_freedom
yili:app_4_test
yili:dev
yili:datamigration-word
..
compare: yili:24b8bef4781b0241c4f5959ac72fd86401808a16
Branches Tags
yili:apps_4_test
yili:apps_dev
yili:apps_dev_ydq_portal_home
yili:apps_dev_ydq_portal_process
yili:apps_dev_ydq_portal_person
yili:apps_dev_ydq_sjdb
yili:apps_dev_ydq_portal_dept
yili:apps_zhaolei_dev
yili:apps_dev_ydq_process_list
yili:apps_dev_ydq_oa_dyAndYy
yili:apps_dev_CEO_whitelist
yili:apps_dev_ydq_freedom
yili:app_4_test
yili:master
yili:dev
yili:datamigration-word

2 Commits
241c255ae0 ... 24b8bef478

Author SHA1 Message Date
袁东强
24b8bef478 Merge branch 'apps_dev_ydq_portal_home' into apps_4_test 2025-10-24 18:17:47 +08:00
袁东强
d9c5116b36 调整首页展示发布部门问题 2025-10-24 18:15:26 +08:00
1 changed files with 15 additions and 12 deletions
Show Stats Expand all files Collapse all files

27
com.awspaas.user.apps.nqms.portal.indexpage/src/com/awspaas/user/apps/nqms/portal/indexpage/service/IndexService.java
View File

@ -1,12 +1,15 @@
package com.awspaas.user.apps.nqms.portal.indexpage.service;
import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryPropertyCache;
import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.cache.DesignerShapeRelationCache;
import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.model.DesignerShapeRelationModel;
import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryPropertyModel;
import com.actionsoft.bpms.bo.engine.BO;
import com.actionsoft.bpms.commons.mvc.view.ResponseObject;
import com.actionsoft.bpms.server.UserContext;
import com.actionsoft.i18n.I18nRes;
import com.actionsoft.sdk.local.SDK;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.awspaas.user.apps.nqms.portal.indexpage.constant.Constants;
import com.awspaas.user.apps.nqms.portal.indexpage.constant.PalCategoryEnum;
@ -268,13 +271,13 @@ public class IndexService {
if (!name.startsWith(String.valueOf(index))) {
continue;
}
if (zllSet.contains(String.valueOf( index))) {
if (zllSet.contains(String.valueOf(index))) {
group = "strategy";
} else if (yylSet.contains(String.valueOf( index))) {
} else if (yylSet.contains(String.valueOf(index))) {
group = "Operations";
} else if (zclSet.contains(String.valueOf( index))) {
} else if (zclSet.contains(String.valueOf(index))) {
group = "SupportAndServices";
}else {
} else {
continue;
}
if (!"1.0".equals(version) && StringUtils.isNotBlank(versionId)) {
@ -546,16 +549,16 @@ public class IndexService {
//文件编号
String fileNo = getFileProper(id, "file_number");
//发布部门
String dutyDept = getFileProper(id, "Issuing_department");
if (StringUtils.isNotEmpty(dutyDept)) {
try {
JSONObject jsonObject = JSONObject.parseObject(dutyDept);
dutyDept = jsonObject.getString("shapeText");
} catch (Exception e) {
e.printStackTrace();
System.out.println("发布部门非JSON格式，转化失败，显示原值。文件ID：" + id);
List<DesignerShapeRelationModel> relationModels = DesignerShapeRelationCache.getByFileId(id, "Issuing_department");
Set<String> dutyDeptSet = new HashSet<>();
// 是否有发布部门的文件属性【可能会有多个值】
if (relationModels != null && relationModels.size() > 0) {
for (DesignerShapeRelationModel relationModel : relationModels) {
JSONObject relationObj = JSONObject.parseObject(relationModel.getRelationShapeText());
dutyDeptSet.add(relationObj.getString("name"));
}
}
String dutyDept = String.join(";",dutyDeptSet);
//流程架构L1
String processL1 = getFileProper(id, "Process_Architecture_L1");
//流程架构L2