Merge branch 'dev_1_3_3_20220822' of http://git.dayaedu.com/yonge/cooleshow into dev_1_3_3_20220822

cooleshow-user/user-biz/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -94,15 +94,18 @@
             <if test="null != param.gender">
                 and u.gender_ = #{param.gender}
             </if>
-            <if test="null != param.lockFlag">
-                and t.lock_flag_ = #{param.lockFlag}
-            </if>
             <if test="param.startTime !=null">
                 <![CDATA[AND t.create_time_ >= #{param.startTime} ]]>
             </if>
             <if test="param.endTime !=null">
                 <![CDATA[AND t.create_time_ < #{param.endTime} ]]>
             </if>
+            <if test="null != param.lockFlag">
+                and t.lock_flag_ = #{param.lockFlag}
+            </if>
+            <if test="null != param.delFlag">
+                and u.del_flag_ = #{param.delFlag}
+            </if>
         </where>
     </select>