zccbbg/wms-ruoyi
1
1
Fork 0
mirror of https://github.com/zccbbg/wms-ruoyi.git synced 2024-09-20 11:05:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 类型不一致问题

Browse source
This commit is contained in:
czc 2024-07-16 11:43:56 +08:00
parent 2abc841fee
commit f55c9f2e86
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
View file

@ -33,7 +33,7 @@ public interface SysPostMapper extends BaseMapperPlus<SysPost, SysPostVo> {
* @param userName 用户名
* @return 结果
*/
List<SysPost> selectPostsByUserName(String userName);
List<SysPostVo> selectPostsByUserName(String userName);
@DataPermission({
@DataColumn(key = "deptName", value = "dept_id"),

5
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/SysUserService.java
View file

@ -22,6 +22,7 @@ import com.ruoyi.common.mybatis.helper.DataBaseHelper;
import com.ruoyi.common.satoken.utils.LoginHelper;
import com.ruoyi.system.domain.bo.SysUserBo;
import com.ruoyi.system.domain.entity.*;
import com.ruoyi.system.domain.vo.SysPostVo;
import com.ruoyi.system.domain.vo.SysRoleVo;
import com.ruoyi.system.domain.vo.SysUserExportVo;
import com.ruoyi.system.domain.vo.SysUserVo;
@ -181,11 +182,11 @@ public class SysUserService implements UserService {
* @return 结果
*/
public String selectUserPostGroup(String userName) {
List<SysPost> list = postMapper.selectPostsByUserName(userName);
List<SysPostVo> list = postMapper.selectPostsByUserName(userName);
if (CollUtil.isEmpty(list)) {
return StringUtils.EMPTY;
}
return StreamUtils.join(list, SysPost::getPostName);
return StreamUtils.join(list, SysPostVo::getPostName);
}
/**