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

src/main/resources/mapper/SysUserRepositorys.xml

@@ -57,28 +57,28 @@
         where
         su.del_flag = 0
         <if test="entity.userType !=null and entity.userType != '' ">
-            and user_type = #{entity.userType}
+            and su.user_type = #{entity.userType}
         </if>
         <if test="entity.name !=null and entity.name != '' ">
-            and name like concat ("%",#{entity.name},"%")
+            and su.name like concat ("%",#{entity.name},"%")
         </if>
         <if test="entity.identity !=null and entity.identity != '' ">
-            and identity = #{entity.identity}
+            and su.identity = #{entity.identity}
         </if>
         <if test="entity.flag !=null and entity.flag != '' ">
-            and flag = #{entity.flag}
+            and su.flag = #{entity.flag}
         </if>
         <if test="entity.position !=null and entity.position != '' ">
-            and position in(${entity.position})
+            and su.position in(${entity.position})
         </if>
         <if test="entity.blacklistFlag == 1 || entity.blacklistFlag == 0">
             and blacklist_flag = #{entity.blacklistFlag}
         </if>
         <if test="entity.deptId !=null and entity.deptId != '' ">
-            and dept_id in(${entity.deptId})
+            and su.dept_id in(${entity.deptId})
         </if>
         <if test="entity.phone !=null and entity.phone != '' ">
-            and phone like concat ("%",#{entity.phone},"%")
+            and su.phone like concat ("%",#{entity.phone},"%")
         </if>
         <if test="entity.beginTime != null and entity.beginTime !='' "><!-- 开始时间检索 -->
             and date_format(su.create_date,'%Y-%m-%d') &gt;= date_format(#{entity.beginTime},'%Y-%m-%d')
@@ -87,7 +87,7 @@
             and date_format(su.create_date,'%Y-%m-%d') &lt;= date_format(#{entity.endTime},'%Y-%m-%d')
         </if>
         <if test="entity.px == '1'.toString() "><!-- 排序-->
-            order BY create_date desc
+            order BY su.create_date desc
         </if>
         <if test="entity.px == '2'.toString() "><!-- 排序-->
             order BY sdd.dict_sort desc