Просмотр исходного кода

fix 订单列表新增我的个代、我的渠道、我的电销菜单

liub 3 недель назад
Родитель
Сommit
2e09c917da

+ 1 - 0
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -1040,6 +1040,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             jzgInfoId = sysUserJzgInfo.getId();
             insOrdersParam.setJzgInfoId(jzgInfoId);
         }
+
         Page<OrderListVo> orderListVoPage;
         if (baseController.getUserSystemCode().equals("APP")) {
             // 手动分页:按车牌+状态分组去重,先统计总数再取当前页(避免 MP 自动 count 解析窗口函数报错)

+ 3 - 4
tenant/insurance/quotation-summary/src/main/resources/mapper/InsOrdersMapper.xml

@@ -954,16 +954,15 @@
             <if test="insOrdersParam.salesman!= null">
                 AND io.real_quote_user_id = #{insOrdersParam.salesman}
             </if>
-            <if test="insOrdersParam.companyId != null and insOrdersParam.companyId != ''">
-                AND io.company_id = #{insOrdersParam.companyId}
-            </if>
             <if test="insOrdersParam.startDate != null and insOrdersParam.startDate != ''and insOrdersParam.endDate != null and insOrdersParam.endDate != ''">
                 AND io.create_time BETWEEN #{insOrdersParam.startDate} and #{insOrdersParam.endDate}
             </if>
-
             <if test="insOrdersParam.companyName != null and insOrdersParam.companyName != ''">
                 AND io.company_name = #{insOrdersParam.companyName}
             </if>
+            <if test="insOrdersParam.companyId != null and insOrdersParam.companyId != ''">
+                AND io.company_id = #{insOrdersParam.companyId}
+            </if>
             <if test="insOrdersParam.productCode != null and insOrdersParam.productCode != ''">
                 AND io.product_id = #{insOrdersParam.productCode}
             </if>