|
@@ -480,12 +480,11 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
|
|
|
String assistantEngineerUserIds = null;
|
|
|
List<FlowFormWidgetResult> formProperty = flowTaskResult.getFormProperty();
|
|
|
for (FlowFormWidgetResult f : formProperty) {
|
|
|
- if (f.getFormId().contains(SystemConstant.REGION_USER_ID) && Objects.nonNull(f.getValue()) && !f.getValue().contains("null")) {
|
|
|
+ if (f.getFormId().equalsIgnoreCase(SystemConstant.REGION_USER_ID) && Objects.nonNull(f.getValue()) && !f.getValue().contains("null")) {
|
|
|
JSONObject jsonObject = JSONObject.parseObject(f.getValue());
|
|
|
String value = jsonObject.getString(SystemConstant.VALUE);
|
|
|
regionUserId = Long.parseLong(value);
|
|
|
- }
|
|
|
- if (f.getFormId().contains(SystemConstant.ASSISTANT_ENGINEER_USER_ID) && Objects.nonNull(f.getValue()) && !f.getValue().contains("null")) {
|
|
|
+ } else if (f.getFormId().equalsIgnoreCase(SystemConstant.ASSISTANT_ENGINEER_USER_ID) && Objects.nonNull(f.getValue()) && !f.getValue().contains("null")) {
|
|
|
// String string = f.getValue().replaceAll("\\[", "").replaceAll("\\]", "");
|
|
|
// assistantEngineerUserIds = StringUtils.join(Arrays.asList(string), SystemConstant.LIST_JOIN_SPLIT);
|
|
|
JSONObject jsonObject = JSONObject.parseObject(f.getValue());
|
|
@@ -495,8 +494,7 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
|
|
|
stringJoiner.add(jsonArray.getString(i));
|
|
|
}
|
|
|
assistantEngineerUserIds = stringJoiner.toString();
|
|
|
- }
|
|
|
- if ((f.getFormId().contains(SystemConstant.ENGINEER_USER_ID) && Objects.nonNull(f.getValue())) && !f.getValue().contains("null")) {
|
|
|
+ } else if ((f.getFormId().equalsIgnoreCase(SystemConstant.ENGINEER_USER_ID) && Objects.nonNull(f.getValue())) && !f.getValue().contains("null")) {
|
|
|
JSONObject jsonObject = JSONObject.parseObject(f.getValue());
|
|
|
String value = jsonObject.getString(SystemConstant.VALUE);
|
|
|
engineerUserId = Long.parseLong(value);
|