diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java index 7015ade670..b1e8824223 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java @@ -144,11 +144,10 @@ public class GuideCategoryController { * @date 2021/9/8 5:11 下午 */ @PostMapping("save") - public Result save(@LoginUser TokenDto tokenDto,@RequestBody EditGuideCategoryFormDTO formDTO){ + public Result save(@LoginUser TokenDto tokenDto,@RequestBody EditGuideCategoryFormDTO formDTO){ formDTO.setStaffId(tokenDto.getUserId()); ValidatorUtils.validateEntity(formDTO,EditGuideCategoryFormDTO.AddUserInternalGroup.class,EditGuideCategoryFormDTO.SaveInfoGroup.class); - guideCategoryService.save(formDTO); - return new Result(); + return new Result().ok(guideCategoryService.save(formDTO)); } @@ -162,11 +161,10 @@ public class GuideCategoryController { * @date 2021/9/8 5:37 下午 */ @PostMapping("update") - public Result update(@LoginUser TokenDto tokenDto,@RequestBody EditGuideCategoryFormDTO formDTO){ + public Result update(@LoginUser TokenDto tokenDto,@RequestBody EditGuideCategoryFormDTO formDTO){ formDTO.setStaffId(tokenDto.getUserId()); ValidatorUtils.validateEntity(formDTO,EditGuideCategoryFormDTO.AddUserInternalGroup.class,EditGuideCategoryFormDTO.UpdateInfoGroup.class); - guideCategoryService.update(formDTO); - return new Result(); + return new Result().ok(guideCategoryService.update(formDTO)); } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryService.java index f652f1036a..5bde4619e6 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryService.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryService.java @@ -86,7 +86,7 @@ public interface GuideCategoryService extends BaseService { * @author generator * @date 2021-09-06 */ - void save(EditGuideCategoryFormDTO dto); + GuideCategoryDTO save(EditGuideCategoryFormDTO dto); /** * 默认更新 @@ -96,7 +96,7 @@ public interface GuideCategoryService extends BaseService { * @author generator * @date 2021-09-06 */ - void update(EditGuideCategoryFormDTO dto); + GuideCategoryDTO update(EditGuideCategoryFormDTO dto); /** * 删除分类,存在办事指南的不允许删除,给予提示 diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java index 44ceab9717..6f3f7a082a 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java @@ -169,7 +169,7 @@ public class GuideCategoryServiceImpl extends BaseServiceImpl 0) { throw new RenException(EpmetErrorCode.GUIDE_CATEGORY_NAME_EXITS.getCode(), EpmetErrorCode.GUIDE_CATEGORY_NAME_EXITS.getMsg()); } @@ -185,11 +185,12 @@ public class GuideCategoryServiceImpl extends BaseServiceImpl 0) { throw new RenException(EpmetErrorCode.GUIDE_CATEGORY_NAME_EXITS.getCode(), EpmetErrorCode.GUIDE_CATEGORY_NAME_EXITS.getMsg()); } @@ -201,6 +202,7 @@ public class GuideCategoryServiceImpl extends BaseServiceImpl