Ver código fonte

研发打卡修改

anderx 2 anos atrás
pai
commit
b587149c9f

+ 5 - 3
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -61,11 +61,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<sql id="selectUserVo">
         select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,d.ancestors,d.max_duration,u.open_id,d.company_id,
-        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
+        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.superior_id ,su.nick_name superiorName,
+		u.job_number,u.full_job
         from sys_user u
 		    left join sys_dept d on u.dept_id = d.dept_id
 		    left join sys_user_role ur on u.user_id = ur.user_id
 		    left join sys_role r on r.role_id = ur.role_id
+			left join sys_user su on u.superior_id=su.user_id
     </sql>
 
     <select id="selectUserList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
@@ -222,7 +224,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="superiorId != null and superiorId != ''">superior_id,</if>
  			<if test="projectQuantity != null and projectQuantity != ''">project_quantity,</if>
  			<if test="jobNumber != null and jobNumber != ''">job_number,</if>
- 			<if test="fullJob != null and fullJob != ''">full_job,</if>
+ 			<if test="fullJob != null ">full_job,</if>
  			<if test="duration != null and duration != ''">duration,</if>
  			create_time
  		)values(
@@ -242,7 +244,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="superiorId != null and superiorId != ''">#{superiorId},</if>
 			<if test="projectQuantity != null and projectQuantity != ''">#{projectQuantity},</if>
 			<if test="jobNumber != null and jobNumber != ''">#{jobNumber},</if>
-			<if test="fullJob != null and fullJob != ''">#{fullJob},</if>
+			<if test="fullJob != null">#{fullJob},</if>
 			<if test="duration != null and duration != ''">#{duration},</if>
  			sysdate()
  		)