调解系统修改

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -125,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
 	    <include refid="selectUserVo"/>
-		where u.user_name = #{userName} and u.del_flag = '0'
+		where u.user_name = #{userName} and u.del_flag = '0' limit 1
 	</select>
 	
 	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
@@ -155,7 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select user_id, email from ms_sys_user where email = #{email} and del_flag = '0' limit 1
 	</select>
 	<select id="selectUserListByIds" resultMap="SysUserResult">
-		select u.user_id,  u.nick_name, u.user_name,u.id_card,u.specialty, u.phonenumber, u.remark from ms_sys_user u
+		select u.* from ms_sys_user u
 
 			<where>
 		<if test="idList != null and idList.size() > 0">
@@ -177,12 +177,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			left join ms_sys_role r on r.role_id = ur.role_id
 		where u.id_card = #{idCard} and u.del_flag = '0' and u.status='0' order by u.create_time limit 1
 	</select>
-	<select id="selectUserByPhone" parameterType="String" resultMap="SysUserResult">
+	<select id="selectUserByEmail" parameterType="String" resultMap="SysUserResult">
 		select u.*,ur.role_id
 			from ms_sys_user u
 			left join ms_sys_user_role ur on u.user_id = ur.user_id
 			left join ms_sys_role r on r.role_id = ur.role_id
-		where u.phonenumber = #{phone} and u.del_flag = '0' and u.status='0' order by u.create_time limit 1
+		where u.eamil = #{eamil} and u.del_flag = '0' and u.status='0' order by u.create_time limit 1
 	</select>
     <select id="selectByDeptIdAndRole" resultMap="SysUserResult">
 		select u.* from
@@ -204,6 +204,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="idCard != null and idCard != ''">id_card,</if>
  			<if test="idType != null ">id_type,</if>
  			<if test="nationality != null ">nationality,</if>
+ 			<if test="birth != null  ">birth,</if>
+ 			<if test="home != null and home != '' ">home,</if>
+ 			<if test="address != null and address != '' ">address,</if>
  			<if test="email != null and email != ''">email,</if>
  			<if test="avatar != null and avatar != ''">avatar,</if>
  			<if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
@@ -222,6 +225,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="idCard != null and idCard != ''">#{idCard},</if>
             <if test="idType != null ">#{idType},</if>
             <if test="nationality != null ">#{nationality},</if>
+            <if test="birth != null  ">#{birth},</if>
+            <if test="home != null and home != '' ">#{home},</if>
+            <if test="address != null and address != '' ">#{address},</if>
             <if test="email != null and email != ''">#{email},</if>
             <if test="avatar != null and avatar != ''">#{avatar},</if>
             <if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
@@ -240,6 +246,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        user_name,
        nick_name,
        id_card,
+       id_type,
+       nationality,
+       birth,
+       home,
+       address,
        email,
        avatar,
        phonenumber,
@@ -257,6 +268,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        #{item.userName},
        #{item.nickName},
        #{item.idCard},
+       #{item.idType},
+       #{item.nationality},
+       #{item.birth},
+       #{item.home},
+       #{item.address},
        #{item.email},
        #{item.avatar},
        #{item.phonenumber},
@@ -280,6 +296,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="idCard != null and idCard != ''">id_card = #{idCard},</if>
            <if test="idType != null">id_type = #{idType},</if>
            <if test="nationality != null">nationality = #{nationality},</if>
+           <if test="birth != null  ">birth = #{birth},</if>
+           <if test="home != null and home != '' ">home = #{home},</if>
+           <if test="address != null and address != '' ">address = #{address},</if>
            <if test="email != null ">email = #{email},</if>
            <if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
            <if test="sex != null and sex != ''">sex = #{sex},</if>