diff --git a/spzx-manager/src/main/java/cn/bunny/controller/FileUploadController.java b/spzx-manager/src/main/java/cn/bunny/controller/FileUploadController.java index 4b4417e..1bbc2de 100644 --- a/spzx-manager/src/main/java/cn/bunny/controller/FileUploadController.java +++ b/spzx-manager/src/main/java/cn/bunny/controller/FileUploadController.java @@ -37,6 +37,6 @@ public class FileUploadController { uploadFileVo.setFilesize(file.getSize()); uploadFileVo.setFilepath(fileUrl); - return Result.build(uploadFileVo, ResultCodeEnum.SUCCESS); + return Result.build(fileUrl, ResultCodeEnum.SUCCESS); } } \ No newline at end of file diff --git a/spzx-manager/src/main/java/cn/bunny/mapper/SysRoleUserMapper.java b/spzx-manager/src/main/java/cn/bunny/mapper/SysRoleUserMapper.java index fb0d07c..3fd62c5 100644 --- a/spzx-manager/src/main/java/cn/bunny/mapper/SysRoleUserMapper.java +++ b/spzx-manager/src/main/java/cn/bunny/mapper/SysRoleUserMapper.java @@ -1,6 +1,7 @@ package cn.bunny.mapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -9,8 +10,8 @@ public interface SysRoleUserMapper { // 根据userId删除用户之前分配角色数据 void deleteByUserId(Long userId); - // 重新分配新数据 - void doAssign(Long userId, Long roleId); + // 重新分配新数据 @Param 导包不要导错 + void doAssign(@Param("userId") Long userId,@Param("roleId") Long roleId); // 根据userId查询用户分配过角色id列表 List selectRoleByUserId(Long userId); diff --git a/spzx-manager/src/main/java/cn/bunny/service/impl/SysRoleServiceImpl.java b/spzx-manager/src/main/java/cn/bunny/service/impl/SysRoleServiceImpl.java index 9c5dc7a..749795f 100644 --- a/spzx-manager/src/main/java/cn/bunny/service/impl/SysRoleServiceImpl.java +++ b/spzx-manager/src/main/java/cn/bunny/service/impl/SysRoleServiceImpl.java @@ -68,7 +68,7 @@ public class SysRoleServiceImpl implements SysRoleService { // 分配过的角色 List roleIds = sysRoleUserMapper.selectRoleByUserId(userId); Map map = new HashMap<>(); - map.put("allRoleList", roleList); + map.put("allRolesList", roleList); map.put("sysUserRoles", roleIds); return map; diff --git a/spzx-manager/src/main/resources/mapper/menu/SysMenuMapper.xml b/spzx-manager/src/main/resources/mapper/menu/SysMenuMapper.xml index eca701e..083f6d4 100644 --- a/spzx-manager/src/main/resources/mapper/menu/SysMenuMapper.xml +++ b/spzx-manager/src/main/resources/mapper/menu/SysMenuMapper.xml @@ -68,7 +68,7 @@ select menu_id from sys_role_menu - where menu_id = #{roleId} + where role_id = #{roleId} and is_deleted = 0 and is_half = 0 diff --git a/spzx-manager/src/main/resources/mapper/user/SysUserMapper.xml b/spzx-manager/src/main/resources/mapper/user/SysUserMapper.xml index 874e763..6d9d191 100644 --- a/spzx-manager/src/main/resources/mapper/user/SysUserMapper.xml +++ b/spzx-manager/src/main/resources/mapper/user/SysUserMapper.xml @@ -48,6 +48,9 @@ status=#{status}, + + avatar=#{avatar}, + update_time = now() where id=#{id}