1.自测bug 其他分支同步到此分支

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcOpeningApplicationController.java

@@ -54,15 +54,19 @@ public class JyjcOpeningApplicationController extends BaseController {
      *
      * @return
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
 	public ResponseModel<JyjcOpeningApplicationModel> save(@RequestBody JSONObject model) {
 		JyjcOpeningApplicationModel jyjcOpeningApplicationModel = new JyjcOpeningApplicationModel();
-		BeanUtil.copyProperties(model.get("applyInfo"),jyjcOpeningApplicationModel);
-	    return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.saveOrUpdateModel(jyjcOpeningApplicationModel, false));
+		// 兼容工作台暂存逻辑、编辑时报错逻辑
+		if (model.containsKey("applyInfo")) { // 工作台暂存逻辑
+			BeanUtil.copyProperties(model.get("applyInfo"), jyjcOpeningApplicationModel);
+		} else {                             // 详情保存逻辑
+			BeanUtil.copyProperties(model, jyjcOpeningApplicationModel);
+		}
+		return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.saveOrUpdateModel(jyjcOpeningApplicationModel, false));
 	}
-
 	/**
      * 根据sequenceNbr更新
      *