#

Junjie

2025-02-14 ac4341ea6b66ae02427d39d35f41d42d78b2eb2e

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/UserController.java

@@ -5,6 +5,7 @@
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.common.annotation.CacheData;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
import com.zy.asrs.wms.common.domain.KeyValVo;
@@ -39,6 +40,7 @@

    @PreAuthorize("hasAuthority('system:user:list')")
    @PostMapping("/user/page")
    @CacheData(tableName = {"sys_user"})
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<User, BaseParam> pageParam = new PageParam<>(baseParam, User.class);
@@ -47,6 +49,7 @@

    @PreAuthorize("hasAuthority('system:user:list')")
    @PostMapping("/user/page1")
    @CacheData(tableName = {"sys_user"})
    public R page1(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<User, BaseParam> pageParam = new PageParam<>(baseParam, User.class);
@@ -55,12 +58,14 @@

    @PreAuthorize("hasAuthority('system:user:list')")
    @PostMapping("/user/list")
    @CacheData(tableName = {"sys_user"})
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(userService.list());
    }

    @PreAuthorize("hasAuthority('system:user:list')")
    @GetMapping("/user/{id}")
    @CacheData(tableName = {"sys_user"})
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(userService.getById(id));
    }
@@ -94,12 +99,12 @@
            throw new CoolException("服务器内部错误");
        }

        userRoleService.remove(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, user.getId()));
        for (Long roleId : user.getRoleIds()) {
            if (!userRoleService.save(new UserRole(user.getId(), roleId))) {
                throw new CoolException("服务器内部错误");
            }
        }
//        userRoleService.remove(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, user.getId()));
//        for (Long roleId : user.getRoleIds()) {
//            if (!userRoleService.save(new UserRole(user.getId(), roleId))) {
//                throw new CoolException("服务器内部错误");
//            }
//        }

        return R.ok("添加成功");
    }