Merge remote-tracking branch 'origin/develop_dl_3.7.0.9' into develop_dl_3.7.0.9

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FormInstanceEquipServiceImpl.java

@@ -214,11 +214,16 @@ public class FormInstanceEquipServiceImpl extends ServiceImpl<FormInstanceEquipM
     @Override
     @Transactional(rollbackFor = {Exception.class, BaseException.class})
     public Object updateForm(Long instanceId, String orgCode, Map<String, Object> map, String groupCode) {
-        if (com.yeejoin.equipmanage.common.utils.StringUtil.isNotEmpty(groupCode)) {
-            map.keySet().forEach(x -> {
-                formInstanceEquipMapper.updateFormFieldValue(instanceId, x, String.valueOf(map.get(x)));
-            });
-            return CommonResponseUtil.success();
+        List<FormInstanceEquip> list = this.queryByInstanceId(instanceId);
+        if (CollectionUtils.isEmpty(list)) {
+            saveForm(groupCode, orgCode, map, String.valueOf(instanceId));
+        } else {
+            if (com.yeejoin.equipmanage.common.utils.StringUtil.isNotEmpty(groupCode)) {
+                map.keySet().forEach(x -> {
+                    formInstanceEquipMapper.updateFormFieldValue(instanceId, x, String.valueOf(map.get(x)));
+                });
+                return CommonResponseUtil.success();
+            }
         }
         return null;
     }