BUG修改

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBSopInfoServiceImpl.java

@@ -485,11 +485,6 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
                 String value = jsonObject.getString(SystemConstant.VALUE);
                 regionUserId = Long.parseLong(value);
             }
-            if ((f.getFormId().contains(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);
-            }
             if (f.getFormId().contains(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);
@@ -501,6 +496,11 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
                 }
                 assistantEngineerUserIds = stringJoiner.toString();
             }
+            if ((f.getFormId().contains(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);
+            }
             if (Objects.nonNull(regionUserId) && Objects.nonNull(engineerUserId) && Objects.nonNull(assistantEngineerUserIds)) {
                 break;
             }