diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/UserController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/UserController.java index 55c04a00..5d378fc5 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/UserController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/UserController.java @@ -30,7 +30,7 @@ public class UserController extends BaseController { * 新增用户 */ @PostMapping("add") - public ApiResult add(@Valid @RequestBody UserAddQO request){ + public ApiResult add(@Valid @RequestBody UserAddQO request) { userControllerService.add(request); return ApiResult.success(); } @@ -39,7 +39,7 @@ public class UserController extends BaseController { * 更新用户 */ @PostMapping("update") - public ApiResult update(@Valid @RequestBody UserUpdateQO request){ + public ApiResult update(@Valid @RequestBody UserUpdateQO request) { userControllerService.update(request); return ApiResult.success(); } @@ -65,8 +65,8 @@ public class UserController extends BaseController { * 删除用户 */ @PostMapping("delete") - public ApiResult delete(@Valid @NotNull Long id){ - userControllerService.delete(id); + public ApiResult delete(@Valid @RequestBody FilterIdQO request) { + userControllerService.delete(request.getId()); return ApiResult.success(); } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/FilterIdQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/FilterIdQO.java new file mode 100644 index 00000000..3ae72d85 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/FilterIdQO.java @@ -0,0 +1,16 @@ +package com.nflg.wms.common.pojo.qo; + +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.experimental.Accessors; + +@Data +@Accessors(chain = true) +public class FilterIdQO { + + /** + * 主键ID + */ + @NotNull + private Long id; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/UserServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/UserServiceImpl.java index a9eb717c..b6b10c93 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/UserServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/UserServiceImpl.java @@ -78,7 +78,10 @@ public class UserServiceImpl extends ServiceImpl implements IU @Override public void delete(Long id) { User user = getById(id); - VUtil.trueThrowBusinessError(Objects.isNull(user)).throwMessage("用户不存在"); + //VUtil.trueThrowBusinessError(Objects.isNull(user)).throwMessage("用户不存在"); + if(Objects.isNull(user)) { + return; + } removeById(id); auditLogService.addDelete(User.class, user, UserUtil.getUserName()); } diff --git a/nflg-wms-repository/src/main/resources/mapper/UserRoleMapMapper.xml b/nflg-wms-repository/src/main/resources/mapper/UserRoleMapMapper.xml index c88374cb..dc5c18f1 100644 --- a/nflg-wms-repository/src/main/resources/mapper/UserRoleMapMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/UserRoleMapMapper.xml @@ -10,9 +10,11 @@