Lianxun_Java.git

old mode 100644 new mode 100755

			@@ -77,10 +77,13 @@
			<select id="getOrgStaffRelInfo" parameterType="Map" resultType="Map">
			select t.rel_id,t.rel_id relId,t.status_cd,t.status_cd statusCd,t.store_id,t.store_id storeId,t.b_id,t.b_id
			bId,t.org_id,t.org_id orgId,t.staff_id,t.staff_id staffId,t.rel_cd,t.rel_cd relCd,uo.parent_org_id parentOrgId,
			uu.name staffName,uo.org_name departmentName,uo.org_id departmentId
			from u_org_staff_rel t,u_org uo,u_user uu
			where t.org_id = uo.org_id
			and t.staff_id = uu.user_id
			uu.name staffName,uo.org_name departmentName,uo.org_id departmentId,td.`name` relCdName,puo.org_name parentOrgName
			from u_org_staff_rel t
			inner join u_org uo on t.org_id = uo.org_id and uo.status_cd = '0'
			inner join u_org puo on uo.parent_org_id = puo.org_id and puo.status_cd = '0'
			inner join u_user uu on t.staff_id = uu.user_id
			left join t_dict td on t.rel_cd = td.status_cd and td.table_name = 'u_org_staff_rel' and td.table_columns = 'rel_cd'
			where 1=1

			<if test='statusCd ==null or statusCd != "1"'>
			and uu.status_cd = '0'
			@@ -174,8 +177,8 @@
			<!-- 根据员工ID查询部门，公司信息 add by zc 2020-02-17 -->
			<select id="queryOrgInfoByStaffIds" parameterType="Map" resultType="Map">
			select
			t.org_id departmentId,t.staff_id staffId,u.org_name departmentName,
			u.parent_org_id companyId,o.org_name companyName
			t.rel_id relId,t.org_id departmentId,t.staff_id staffId,t.store_id storeId,u.org_name departmentName,
			u.parent_org_id companyId,o.org_name companyName,o.org_id companyId
			from
			u_org_staff_rel t
			inner join u_org u on t.org_id = u.org_id
			@@ -187,6 +190,9 @@
			#{item}
			</foreach>
			</if>
			<if test="staffId !=null and staffId !=''">
			and t.staff_id =#{staffId}
			</if>
			</select>

			</mapper>