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

update:修改bug

Browse Source
This commit is contained in:
qk
2022-05-23 15:28:05 +08:00
parent 7e03bc471d
commit ba47fd5481
14 changed files with 257 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml
+26
View File
@@ -21,6 +21,15 @@
<result column="name" property="name"/>
<result column="has_child" property="hasChild"/>
</resultMap>
<resultMap id="TreeVoMap" type="com.adc.da.slrs.sarInstitution.entity.TreeVo">
<result column="USID" property="id"/>
<result column="INSTITUTION_ID" property="parentId"/>
<result column="UNAME" property="name"/>
</resultMap>
<resultMap id="TreeVoMap2" type="com.adc.da.slrs.sarInstitution.entity.TreeVo">
<result column="id" property="id"/>
<result column="name" property="name"/>
</resultMap>
<resultMap id="TsUser" type="com.adc.da.slrs.sarInstitution.entity.TsUserVO">
<result column="usid" property="id"/>
@@ -35,6 +44,23 @@
WHERE parent_id=#{institutionId}
</select>
<select id="selectPreviousInstitution" resultMap="TsUser">
select * from ts_user
<where>
<if test="userName != null and userName != '' ">
( ts_user.ACCOUNT like concat(concat('%',#{userName}),'%') or ts_user.UNAME like concat(concat('%',#{userName}),'%') )
</if>
</where>
</select>
<select id="selectInstitution" resultType="com.adc.da.slrs.sarInstitution.entity.TsInstitution">
select * from ts_institution
WHERE
id IN
<foreach collection="pId" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</select>
<select id="selectNextUsers" resultMap="TsUser">
select ts_user.EMAIL,ts_user.ACCOUNT,ts_user.CREATION_TIME,ts_user.DISABLE_FLAG,ts_user.EXT_INFO,ts_user.USID,
ts_user.INSTITUTION_ID,t2.name as INSTITUTION_NAME,ts_user.MODIFY_TIME,ts_user.OPER_USER,ts_user.PASSWORD,ts_user.PHONE,
adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml
+11 -2
View File
@@ -120,8 +120,17 @@
</select>
<select id="selectDeptByDY" resultMap="UserPosition">
select ts_user.USID,ts_user.INSTITUTION_ID,ts_institution.name as institution_name from ts_user
left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
select ts_user.USID,ts_user.INSTITUTION_ID,
concat(
t3.`name`,
concat(
'_',
concat(
t2.`name`,
concat( '_', t1.`name` )))) as institution_name from ts_user
left join ts_institution t1 on t1.id=ts_user.INSTITUTION_ID
LEFT JOIN ts_institution t2 ON t1.parent_id = t2.id
LEFT JOIN ts_institution t3 ON t2.parent_id = t3.id
where ts_user.USID in
<foreach item="msgId" collection="list" open="(" separator="," close=")" index="index">
#{msgId}