[修改] 获取当前人领导

adc-da-sys/target/classes/mybatis/mapper/sys/mysql/UserEOMapper.xml

@@ -184,7 +184,7 @@
             #{id}
         </foreach>
     </select>
-    <select id="getUserEoById" resultType="com.adc.da.sys.entity.UserEO">
+    <select id="getUserEoById" resultMap="UserDetailMap">
         select
             users.usid,
             users.usname,
@@ -201,9 +201,9 @@
             o.bmdm_14 as o_bmdm14
         from TS_USER users
                  left join TR_USER_ROLE ur on users.usid = ur.user_id
-                 left join TS_ROLE r on ur.role_id = r.id
+                 left join TS_ROLE r on ur.role_id = r.id and  r.del_flag = 0
                  left join TR_USER_ORG uo on users.usid = uo.user_id
-                 left join TS_ORG o on uo.org_id = o.org_code
+                 left join TS_ORG o on uo.org_id = o.org_code and o.status = 1
         where users.del_flag != 1
         and  users.usid=#{usid}
     </select>
@@ -262,7 +262,7 @@
         <where>
             uo.org_id in
             <foreach collection="Vo" item="item" open="(" separator="," close=")">
-                #{item.Id}
+                #{item.id}
             </foreach>
             and (u.level_id=5 or u.level_id=9) and u.employee_type_id = 1
         </where>