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

批处理在正式环境oracle数据库中旧的关联关系无法删除问题

Browse Source
This commit is contained in:
446052889@qq.com 2022-07-28 10:56:19 +08:00
parent dd74174bc1
commit 2f6497be99
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

30
com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/process/ImportProcessExcel.java
View File

@ -24,6 +24,7 @@ import com.actionsoft.bpms.org.model.UserModel;
import com.actionsoft.bpms.server.UserContext;
import com.actionsoft.bpms.util.UUIDGener;
import com.actionsoft.bpms.util.UtilDate;
import com.actionsoft.bpms.util.UtilString;
import com.actionsoft.i18n.I18nRes;
import com.actionsoft.sdk.local.SDK;
import com.alibaba.fastjson.JSONArray;
@ -221,6 +222,17 @@ public class ImportProcessExcel {
}
}
} else if ("awsorg".equals(type)) {// 关联aws的组织架构
JSONObject object2 = new JSONObject();
object2.put("relationShapeId", "");
object2.put("shapeId", "");
object2.put("attrId", attrId);
object2.put("shapeText", "");
object2.put("relationFileId", "000");
object2.put("relationShapeText", "");
object2.put("groupPath", groupPath);
object2.put("fileId", "");
property.setPropertyValue(object2.toString());
JSONObject object3 = cellData.getJSONObject("data");
JSONArray deptArr = object3.getJSONArray("department");// 部门
JSONArray roleArr = object3.getJSONArray("role");// 角色
@ -366,9 +378,13 @@ public class ImportProcessExcel {
delPropertyList.addAll(removeProps);// 记录需要删除的文件属性配置
}
// 记录需要删除的关联属性
List<DesignerShapeRelationModel> removeRelations = relationDao.query(plId, "", attrId, null, null);
List<DesignerShapeRelationModel> removeRelations = relationDao.query(plId, null, attrId, null, null);
if (removeRelations.size() > 0) {
delRelationList.addAll(removeRelations);
for (DesignerShapeRelationModel relation : removeRelations) {
if (UtilString.isEmpty(relation.getShapeId())) {// 过滤掉形状不为空的即为文件属性
delRelationList.addAll(removeRelations);
}
}
}
if ("string".equals(type) || "textarea".equals(type)) {
@ -418,6 +434,16 @@ public class ImportProcessExcel {
}
}
} else if ("awsorg".equals(type)) {// 关联aws的组织架构
JSONObject object2 = new JSONObject();
object2.put("relationShapeId", "");
object2.put("shapeId", "");
object2.put("attrId", attrId);
object2.put("shapeText", "");
object2.put("relationFileId", "000");
object2.put("relationShapeText", "");
object2.put("groupPath", groupPath);
object2.put("fileId", "");
property.setPropertyValue(object2.toString());
JSONObject object3 = cellData.getJSONObject("data");
JSONArray deptArr = object3.getJSONArray("department");// 部门
JSONArray roleArr = object3.getJSONArray("role");// 角色