Merge remote-tracking branch 'origin/sqd' into sqd

maven

7 天以前 9e5c392acb19838c263a569b09bb56da94bdbbf6

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

@@ -88,7 +88,7 @@
      <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
         AND date_format(u.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
      </if>
      <if test="params.deptId != null">
      <if test="deptId != null">
         AND u.user_id IN
         (
         SELECT user_id FROM sys_user_dept WHERE dept_id = #{deptId}
@@ -158,6 +158,28 @@
          #{item}
        </foreach>
   </select>
   <select id="selectList" resultType="com.ruoyi.project.system.domain.SysUser">
      SELECT user_id, nick_name FROM sys_user
      <where>
         <if test="list != null and list.size() > 0">
            user_id IN
            <foreach item="id" collection="list" open="(" separator="," close=")">
               #{id}
            </foreach>
         </if>
         <if test="list == null or list.size() == 0">
            1=0  <!-- 空列表时返回空结果 -->
         </if>
      </where>
   </select>
   <select id="selectUsersByIds" resultType="com.ruoyi.project.system.domain.SysUser">
      SELECT user_id, nick_name
      FROM sys_user
      WHERE user_id IN
      <foreach collection="userIds" item="id" open="(" separator="," close=")">
         #{id}
      </foreach>
   </select>

   <insert id="insertUser" parameterType="com.ruoyi.project.system.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
       insert into sys_user(