diff --git a/src/main/java/com/gunshi/project/hsz/controller/ByLogController.java b/src/main/java/com/gunshi/project/hsz/controller/ByLogController.java index 7fbafe2..01fd9dd 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/ByLogController.java +++ b/src/main/java/com/gunshi/project/hsz/controller/ByLogController.java @@ -14,6 +14,8 @@ import com.gunshi.project.hsz.service.ByLogService; import com.gunshi.project.hsz.service.FileAssociationsService; import com.gunshi.project.hsz.validate.markers.Insert; import com.gunshi.project.hsz.validate.markers.Update; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.system.service.impl.SysUserServiceImpl; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; @@ -42,21 +44,18 @@ public class ByLogController extends AbstractCommonFileController { @Autowired private FileAssociationsService fileService; + @Autowired + private SysUserServiceImpl sysUserService; + @Operation(summary = "新增") @PostMapping("/insert") public R insert(@Validated(Insert.class) @RequestBody ByLog dto) { - dto.setId(IdWorker.getId()); - List byLogDetails = dto.getDetails(); - byLogDetails.forEach(detail -> { - detail.setId(IdWorker.getId()); - detail.setByLogId(dto.getId()); - }); - boolean save = byLogService.save(dto); - boolean flag2 = byLogDetailService.saveBatch(byLogDetails); - if (save && flag2) { + + boolean flag = byLogService.saveData(dto); + if (flag) { fileService.saveFile(dto.getFiles(), getGroupId(), dto.getId().toString()); } - return R.ok(save && flag2 ? dto : null); + return R.ok(flag? dto : null); } @Operation(summary = "修改") diff --git a/src/main/java/com/gunshi/project/hsz/mapper/ByLogDetailMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/ByLogDetailMapper.java index 2760f32..51c0878 100644 --- a/src/main/java/com/gunshi/project/hsz/mapper/ByLogDetailMapper.java +++ b/src/main/java/com/gunshi/project/hsz/mapper/ByLogDetailMapper.java @@ -15,7 +15,7 @@ public interface ByLogDetailMapper extends BaseMapper { @Select("""