parent
2ba1608ecf
commit
7d1a3750ef
|
|
@ -30,7 +30,7 @@ public class UserController extends BaseController {
|
||||||
* 新增用户
|
* 新增用户
|
||||||
*/
|
*/
|
||||||
@PostMapping("add")
|
@PostMapping("add")
|
||||||
public ApiResult<Void> add(@Valid @RequestBody UserAddQO request){
|
public ApiResult<Void> add(@Valid @RequestBody UserAddQO request) {
|
||||||
userControllerService.add(request);
|
userControllerService.add(request);
|
||||||
return ApiResult.success();
|
return ApiResult.success();
|
||||||
}
|
}
|
||||||
|
|
@ -39,7 +39,7 @@ public class UserController extends BaseController {
|
||||||
* 更新用户
|
* 更新用户
|
||||||
*/
|
*/
|
||||||
@PostMapping("update")
|
@PostMapping("update")
|
||||||
public ApiResult<Void> update(@Valid @RequestBody UserUpdateQO request){
|
public ApiResult<Void> update(@Valid @RequestBody UserUpdateQO request) {
|
||||||
userControllerService.update(request);
|
userControllerService.update(request);
|
||||||
return ApiResult.success();
|
return ApiResult.success();
|
||||||
}
|
}
|
||||||
|
|
@ -65,8 +65,8 @@ public class UserController extends BaseController {
|
||||||
* 删除用户
|
* 删除用户
|
||||||
*/
|
*/
|
||||||
@PostMapping("delete")
|
@PostMapping("delete")
|
||||||
public ApiResult<Void> delete(@Valid @NotNull Long id){
|
public ApiResult<Void> delete(@Valid @RequestBody FilterIdQO request) {
|
||||||
userControllerService.delete(id);
|
userControllerService.delete(request.getId());
|
||||||
return ApiResult.success();
|
return ApiResult.success();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
}
|
||||||
|
|
@ -78,7 +78,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
|
||||||
@Override
|
@Override
|
||||||
public void delete(Long id) {
|
public void delete(Long id) {
|
||||||
User user = getById(id);
|
User user = getById(id);
|
||||||
VUtil.trueThrowBusinessError(Objects.isNull(user)).throwMessage("用户不存在");
|
//VUtil.trueThrowBusinessError(Objects.isNull(user)).throwMessage("用户不存在");
|
||||||
|
if(Objects.isNull(user)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
removeById(id);
|
removeById(id);
|
||||||
auditLogService.addDelete(User.class, user, UserUtil.getUserName());
|
auditLogService.addDelete(User.class, user, UserUtil.getUserName());
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,9 +10,11 @@
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getAuthorizeUser" resultType="com.nflg.wms.common.pojo.vo.UserVO">
|
<select id="getAuthorizeUser" resultType="com.nflg.wms.common.pojo.vo.UserVO">
|
||||||
select u.*
|
select u.*,c."name" as dept_name
|
||||||
from user_role_map urm
|
from user_role_map urm
|
||||||
inner join "user" u on urm.user_id = u.id
|
inner join "user" u on urm.user_id = u.id
|
||||||
|
left join user_interior b on u."id"=b.user_id
|
||||||
|
left join department c on b.dept_id=c."id"
|
||||||
where urm.role_id = #{roleId}
|
where urm.role_id = #{roleId}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue