FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_master' into develop_master

Browse Source
This commit is contained in:
yuezhihang
2022-03-16 18:21:05 +08:00
parent 23b81d878c e917c949fc
commit deab88a7cd
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml
+5 -1
View File
@@ -13,6 +13,9 @@
<result property="id" column="rid"/>
<result property="name" column="r_name"/>
</collection>
<collection property="tsUser" ofType="com.adc.da.slrs.sarUser.entity.TsUser">
<result property="uname" column="UNAME"/>
</collection>
</resultMap>
<select id="getRole" resultType="com.adc.da.slrs.sarRole.entity.TsRole">
select * from ts_role r
@@ -22,11 +25,12 @@
</select>
<select id="selectPositionAndRole" resultMap="PositionAndRole">
select p.*,r.id rid,r.name r_name from ts_position p
select p.*,r.id rid,r.name r_name ,tu.UNAME as UNAME from ts_position p
left join ts_position_role pr
on p.id=pr.position_id
left join ts_role r
on pr.role_id=r.id
left join ts_user tu on tu.account = p.operator
<where>
<if test="name!=null">
p.name like concat(concat('%',#{name}),'%')