|
@@ -80,14 +80,12 @@ public class MarkingController extends BaseController {
|
|
|
// ProjectTeam byUserIdAndProjectId = projectTeamService.findByUserIdAndProjectId(getUserId(), param.getProjectId());
|
|
|
// param.setLastUpdateBy(byUserIdAndProjectId.getNickName());
|
|
|
markingService.updateById(param);
|
|
|
- markingId=param.getMarkingId();
|
|
|
} else {
|
|
|
// 写为空的逻辑
|
|
|
log.info("为空");
|
|
|
// ProjectTeam byUserIdAndProjectId = projectTeamService.findByUserIdAndProjectId(getUserId(), param.getProjectId());
|
|
|
// param.setLastCreateBy(byUserIdAndProjectId.getNickName());
|
|
|
markingService.save(param);
|
|
|
- markingId=param.getMarkingId();
|
|
|
}
|
|
|
if (CollectionUtil.isNotEmpty(param.getUserIds())) {
|
|
|
markingUserService.delByMarkingId(param.getMarkingId());
|
|
@@ -107,6 +105,6 @@ public class MarkingController extends BaseController {
|
|
|
markingUserService.save(markingUser);
|
|
|
}
|
|
|
}
|
|
|
- return ResultData.ok(markingId);
|
|
|
+ return ResultData.ok(param);
|
|
|
}
|
|
|
}
|