lyhzzz 2 роки тому
батько
коміт
7f681e595e

+ 1 - 0
src/main/java/com/fdkankan/manage/service/impl/AuthorizeCameraServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.Date;
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.common.util.SecurityUtil;
 import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.entity.*;

+ 3 - 3
src/main/resources/mapper/manage/DownloadOrderMapper.xml

@@ -12,7 +12,7 @@
         left join t_user u on o.user_id = u.id
         <include refid="commonWhere"></include>
         <if test="param.customerType!=null or param.payMethod!=null or param.useType!=null">
-            o.rec_status = 'ABC'
+           and  o.rec_status = 'ABC'
         </if>
         union all
         SELECT o.*,u.user_name ,'线下'as payMethod
@@ -20,10 +20,10 @@
         left join t_user u on o.user_id = u.id
         <include refid="commonWhere"></include>
         <if test="param.customerType!=null">
-            o.customer_type = #{param.customerType}
+           and o.customer_type = #{param.customerType}
         </if>
         <if test="param.useType!=null">
-            o.use_type = #{param.useType}
+            and o.use_type = #{param.useType}
         </if>
         order by create_time desc
     </select>

+ 3 - 3
src/main/resources/mapper/manage/IncrementOrderMapper.xml

@@ -12,17 +12,17 @@
         left join t_user u on o.user_id = u.id
         <include refid="commonWhere"></include>
         <if test="param.customerType!=null or param.payMethod!=null or param.useType!=null">
-            o.rec_status = 'ABC'
+           and o.rec_status = 'ABC'
         </if>
         union all
         SELECT o.*,u.user_name,u.nick_name ,'线下'as payMethod from t_increment_order_mg o
         left join t_user u on o.user_id = u.id
         <include refid="commonWhere"></include>
         <if test="param.customerType!=null">
-            o.customer_type = #{param.customerType}
+           and o.customer_type = #{param.customerType}
         </if>
         <if test="param.useType!=null">
-            o.use_type = #{param.useType}
+            and o.use_type = #{param.useType}
         </if>
         order by create_time desc
     </select>