Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
paidaxing444 2020-04-21 10:12:48 +08:00
commit a2fa5e6428
3 changed files with 1162 additions and 1162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-ui/src/views/system/user/index.vue
View File

@ -248,7 +248,6 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="岗位">
<el-select v-model="form.postIds" multiple placeholder="请选择">

2
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
View File

@ -110,7 +110,7 @@ public class SysRoleServiceImpl implements ISysRoleService
@Override
public List<Integer> selectYeyRoleListByUserId(Long userId)
{
return selectYeyRoleListByUserId(userId);
return roleMapper.selectYeyRoleListByUserId(userId);
}
/**

7
ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml
View File

@ -58,11 +58,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectRoleAll" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
WHERE r.del_flag = '0'
</select>
<select id="selectYeyRoleAll" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
where r.purpose = '1'
where r.purpose = '1' and r.del_flag = '0'
</select>
<select id="selectRoleListByUserId" parameterType="Long" resultType="Integer">
@ -70,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from sys_role r
left join sys_user_role ur on ur.role_id = r.role_id
left join sys_user u on u.user_id = ur.user_id
where u.user_id = #{userId}
where u.user_id = #{userId} and r.del_flag = '0'
</select>
<select id="selectYeyRoleListByUserId" parameterType="Long" resultType="Integer">
@ -78,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from sys_role r
left join sys_user_role ur on ur.role_id = r.role_id
left join sys_user u on u.user_id = ur.user_id
where r.purpose = '1' and u.user_id = #{userId}
where r.purpose = '1' and u.user_id = #{userId} and r.del_flag = '0'
</select>
<select id="selectRoleById" parameterType="Long" resultMap="SysRoleResult">