xiewj 2 lat temu
rodzic
commit
66dd0003b4

+ 4 - 3
src/main/java/com/fdkankan/site/controller/MarkingController.java

@@ -73,18 +73,19 @@ public class MarkingController  extends BaseController {
      */
     @PostMapping("/addOrUpdate")
     public ResultData addOrUpdate(@RequestBody MarkingParam param){
+        Integer markingId=0;
         if (Optional.ofNullable(param.getMarkingId()).isPresent()){
             // 写不为空的逻辑
             log.info("不为空修改");
             ProjectTeam byUserIdAndProjectId = projectTeamService.findByUserIdAndProjectId(getUserId(), param.getProjectId());
             param.setLastUpdateBy(byUserIdAndProjectId.getNickName());
             markingService.updateById(param);
-
+            markingId=param.getMarkingId();
         } else {
             // 写为空的逻辑
             log.info("为空");
-            param.setMarkingStatus(MarkingStatus.PENDING.getState());
             markingService.save(param);
+            markingId=param.getMarkingId();
         }
         if (CollectionUtil.isNotEmpty(param.getUserIds())) {
             markingUserService.delByMarkingId(param.getMarkingId());
@@ -104,6 +105,6 @@ public class MarkingController  extends BaseController {
                 markingUserService.save(markingUser);
             }
         }
-        return ResultData.ok();
+        return ResultData.ok(markingId);
     }
 }