Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev

renren-admin/src/main/resources/mapper/sys/SysRoleUserDao.xml

@@ -20,11 +20,12 @@
 
     -->
     <update id="deleteByUserIds">
-        UPDATE sys_role_user SET del_flag = 0, update_date = NOW(), updater = #{updater}
+        UPDATE sys_role_user SET del_flag = 1, update_date = NOW(), updater = #{updater}
         where user_id in
         <foreach item="userId" collection="userIds" open="(" separator="," close=")">
             #{userId}
         </foreach>
+        AND del_flag = 0
     </update>
 
     <select id="getRoleIdList" resultType="long">

renren-admin/src/main/resources/mapper/sys/SysUserDao.xml

@@ -33,7 +33,7 @@
         </if>
         <if test="role_id != null">
             AND EXISTS(SELECT 1 FROM sys_role_user WHERE sys_role_user.user_id = t1.id AND sys_role_user.role_id =
-            #{role_id}) AND sys_role_user.del_flag = 0
+            #{role_id} AND sys_role_user.del_flag = 0)
         </if>
     </select>