소스 검색

删除用户中考勤相关代码

kouchengxing 5 년 전
부모
커밋
866823bfd1
1개의 변경된 파일4개의 추가작업 그리고 13개의 파일을 삭제
  1. 4 13
      dgtly-system/src/main/resources/mapper/system/SysUserMapper.xml

+ 4 - 13
dgtly-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -25,10 +25,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateBy"     column="update_by"    />
 		<result property="updateTime"   column="update_time"  />
 		<result property="remark"       column="remark"       />
-		<result property="workAddr"       column="work_addr"       />
-		<result property="workSchedul"       column="work_schedul"       />
-		<result property="addrNum"       column="addr_num"       />
-		<result property="schedulDetail"       column="schedul_detail"       />
 		<association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
 		<association property="company"    column="company_id" javaType="SysCompany" resultMap="companyResult" />
 		<collection  property="roles"   javaType="java.util.List"        resultMap="RoleResult" />
@@ -69,12 +65,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 	
 	<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id,u.company_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,
-		a.addr_detail as work_addr,a.addr_num as addr_num,s.schedul_name as work_schedul,s.schedul_detail as schedul_detail from sys_user u
+		select u.user_id,u.company_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
+		from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		left join sys_company c on u.company_id = c.id
-		LEFT JOIN sign_addr a ON a.id = u.work_addr
-		LEFT JOIN sign_schedul s ON s.id = u.work_schedul
 		where u.del_flag = '0'
 		<if test="loginName != null and loginName != ''">
 			AND u.login_name like concat('%', #{loginName}, '%')
@@ -257,12 +251,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</insert>
 
 	<select id="needSignUser" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,
-		a.addr_detail as work_addr,a.addr_num as addr_num,s.schedul_name as work_schedul,s.schedul_detail as schedul_detail from sys_user u
+		select u.user_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
+		from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
-		LEFT JOIN sign_addr a ON a.id = u.work_addr
-		LEFT JOIN sign_schedul s ON s.id = u.work_schedul
-		where u.del_flag = '0' and u.work_schedul != '' and u.work_schedul is not null
 		<if test="companyId != null and companyId != 0"> and u.company_id = #{companyId}</if>
 
 	</select>