bugfix

src/main/java/com/caimei365/manager/service/caimei/user/impl/CmBehaviorRecordServiceImpl.java

@@ -83,6 +83,7 @@ public class CmBehaviorRecordServiceImpl implements CmBehaviorRecordService {
     @Override
     public List<CmBehaviorRecord> exportExcel(CmBehaviorRecord cmBehaviorRecord) {
         List<String> labels = new ArrayList<>();
+        String behaviorType = "";
         if (StringUtils.isNotBlank(cmBehaviorRecord.getLabel())) {
             if (cmBehaviorRecord.getLabel().contains(",")) {
                 String[] split = cmBehaviorRecord.getLabel().split(",");
@@ -94,7 +95,11 @@ public class CmBehaviorRecordServiceImpl implements CmBehaviorRecordService {
             }
         }
         cmBehaviorRecord.setLabels(labels);
-
+        //"深圳艾斯佰丽生物科技有限公司".equals(cmBehaviorRecord.getSpName())
+        if ("深圳艾斯佰丽生物科技有限公司".equals(cmBehaviorRecord.getRelevanceShop())) {
+            behaviorType = "2";
+        }
+        cmBehaviorRecord.setBehaviorType(behaviorType);
         List<CmBehaviorRecord> list = null;
         if (cmBehaviorRecord.getTodayType() == 0) {
             // 当天数据

src/main/resources/mapper/CmBehaciorRecordDao.xml

@@ -99,7 +99,6 @@
         accessDate,
         accessClient,
         region,
-        relevanceShop,
         label,
         relevanceShop,
         addTime
@@ -128,6 +127,9 @@
             </if>
             <if test="relevanceShop != null and relevanceShop != ''">
                 AND relevanceShop like concat('%',#{relevanceShop},'%')
+                <if test="behaviorType == 2">
+                    or behaviorType = #{behaviorType}
+                </if>
             </if>
             <if test="labels != null and labels.size > 0">
                 AND