卓美，商城订单优化数据展示和导出

fs-company/src/main/java/com/fs/hisStore/controller/FsStoreOrderScrmController.java

@@ -133,8 +133,8 @@ public class FsStoreOrderScrmController extends BaseController
         if("北京卓美".equals(cloudHostProper.getCompanyName())){
             if(!"00".equals(loginUser.getUser().getUserType())){//非管理员看见自己数据
                 param.setCompanyUserId(loginUser.getUser().getUserId());
-                param.setIsCompanyOrder(1);//是否销售订单
             }
+            param.setIsCompanyOrder(1);//是否销售订单
         }
 
 
@@ -215,6 +215,12 @@ public class FsStoreOrderScrmController extends BaseController
         if(!StringUtils.isEmpty(param.getDeliveryImportTimeRange())){
             param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
         }
+        if("北京卓美".equals(cloudHostProper.getCompanyName())){
+            if(!"00".equals(loginUser.getUser().getUserType())){//非管理员看见自己数据
+                param.setCompanyUserId(loginUser.getUser().getUserId());
+            }
+            param.setIsCompanyOrder(1);//是否销售订单
+        }
         List<FsStoreOrderErpExportVO> list = fsStoreOrderService.selectFsStoreOrderListVOByExport(param);
         //对手机号脱敏
         if(list!=null){
@@ -513,7 +519,12 @@ public class FsStoreOrderScrmController extends BaseController
         if(!StringUtils.isEmpty(param.getDeliveryImportTimeRange())){
             param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
         }
-
+        if("北京卓美".equals(cloudHostProper.getCompanyName())){
+            if(!"00".equals(loginUser.getUser().getUserType())){//非管理员看见自己数据
+                param.setCompanyUserId(loginUser.getUser().getUserId());
+            }
+            param.setIsCompanyOrder(1);//是否销售订单
+        }
         List<FsStoreOrderItemExportVO> list=orderItemService.selectFsStoreOrderItemListExportVO(param);
         //对手机号脱敏
         if(list!=null){

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreOrderItemScrmMapper.java

@@ -187,8 +187,11 @@ public interface FsStoreOrderItemScrmMapper
             "                and psps.product_name like concat('%', #{maps.productName}, '%')\n" +
             "            </if>"+
             "<if test = 'maps.isAudit != null'> " +
-            "and o.is_audit = #{maps.isAudit} " +
+            "and o.is_audit = #{maps.isAudit} \n" +
             "</if>" +
+            "            <if test=\"maps.isCompanyOrder != null and maps.isCompanyOrder > 0\">\n" +
+            "                and o.order_type != 3 and o.order_type != 2\n" +
+            "            </if>"+
             "GROUP BY  o.id order by o.id desc limit 50000"+
             "</script>"})
     List<FsStoreOrderItemExportVO> selectFsStoreOrderItemListExportVO(@Param("maps")FsStoreOrderParam fsStoreOrder);

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreOrderScrmMapper.java

@@ -768,6 +768,9 @@ public interface FsStoreOrderScrmMapper
             "<if test = 'maps.isAudit != null'> " +
             "and o.is_audit = #{maps.isAudit} " +
             "</if>" +
+            "            <if test=\"maps.isCompanyOrder != null and maps.isCompanyOrder > 0\">\n" +
+            "                and o.order_type != 3 and o.order_type != 2\n" +
+            "            </if>"+
             " ${maps.params.dataScope} "+
             " order by o.id desc limit 50000"+
             "</script>"})

fs-service/src/main/resources/mapper/hisStore/FsStoreOrderScrmMapper.xml

@@ -1899,7 +1899,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and o.is_audit = #{maps.isAudit}
             </if>
             <if test="maps.isCompanyOrder != null and maps.isCompanyOrder > 0">
-                and o.order_type != 3
+                and o.order_type != 3 and o.order_type != 2
             </if>
             <if test="maps.companyUserIds != null  and maps.companyUserIds.size > 0">
                 and o.company_user_id in