diff --git a/com.actionsoft.apps.coe.pal.batch/lib/com.actionsoft.apps.coe.pal.batch.jar b/com.actionsoft.apps.coe.pal.batch/lib/com.actionsoft.apps.coe.pal.batch.jar index 9b29ed38..5100b134 100644 Binary files a/com.actionsoft.apps.coe.pal.batch/lib/com.actionsoft.apps.coe.pal.batch.jar and b/com.actionsoft.apps.coe.pal.batch/lib/com.actionsoft.apps.coe.pal.batch.jar differ diff --git a/com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/process/ImportProcessExcel.java b/com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/process/ImportProcessExcel.java index dea900b7..965711f8 100644 --- a/com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/process/ImportProcessExcel.java +++ b/com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/process/ImportProcessExcel.java @@ -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 removeRelations = relationDao.query(plId, "", attrId, null, null); + List 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");// 角色