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

gongchunyi

2 天以前 d80c1fe5bc2b604a27c2e985ea7593ba6618cc37

 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}