Merge branch 'master' into lcy

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/ChannelAnalyseServiceImpl.java

@@ -564,6 +564,20 @@ public class ChannelAnalyseServiceImpl implements ChannelAnalyseService {
         //1.根据不同级别得到需要查询的 地区码
         List<String> wdAddrCode = findWdAddrCode(channelMapAceeptVo.getRankType(), channelMapAceeptVo.getAddrCode());
 
+        //是否有联系方式
+        if(channelMapAceeptVo.getIsTelephone() != null && !channelMapAceeptVo.getIsTelephone().equals("")){
+            queryWrapper.and(wdInfoQueryWrapper -> {
+                wdInfoQueryWrapper.eq("is_telephone",channelMapAceeptVo.getIsTelephone().equals("true") ? 1:0);
+            });
+        }
+
+        //是否关联品牌
+        if(channelMapAceeptVo.getIsBrand() != null && !channelMapAceeptVo.getIsBrand().equals("")){
+            queryWrapper.and(wdInfoQueryWrapper -> {
+                wdInfoQueryWrapper.eq("is_brand",channelMapAceeptVo.getIsTelephone().equals("true") ? 1:0);
+            });
+        }
+
         //店龄
         if(channelMapAceeptVo.getStoreAge() != null && !channelMapAceeptVo.getStoreAge().equals("")){
             queryWrapper.and(wdInfoQueryWrapper -> {
@@ -600,20 +614,6 @@ public class ChannelAnalyseServiceImpl implements ChannelAnalyseService {
         }
 
 
-        //是否关联品牌
-        if(channelMapAceeptVo.getIsBrand() != null && !channelMapAceeptVo.getIsBrand().equals("")){
-            queryWrapper.and(wdInfoQueryWrapper -> {
-                wdInfoQueryWrapper.isNotNull("brand_name");
-            });
-        }
-
-        //是否有联系方式
-        if(channelMapAceeptVo.getIsTelephone() != null && !channelMapAceeptVo.getIsTelephone().equals("")){
-            queryWrapper.and(wdInfoQueryWrapper -> {
-                wdInfoQueryWrapper.isNotNull("teletphone");
-            });
-        }
-
         //搜索字段
         if (channelMapAceeptVo.getSearchText() != null && !channelMapAceeptVo.getSearchText() .trim().equals("")) {
             queryWrapper.and(originWdInfoQueryWrapper -> {

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/ChannelMapServiceImpl.java

@@ -756,6 +756,20 @@ public class ChannelMapServiceImpl implements ChannelMapService {
         //1.根据不同级别得到需要查询的 地区码
         List<String> wdAddrCode = findWdAddrCode(channelMapAceeptVo.getRankType(), channelMapAceeptVo.getAddrCode());
 
+        //是否有联系方式
+        if(channelMapAceeptVo.getIsTelephone() != null && !channelMapAceeptVo.getIsTelephone().equals("")){
+            queryWrapper.and(wdInfoQueryWrapper -> {
+                wdInfoQueryWrapper.eq("is_telephone",channelMapAceeptVo.getIsTelephone().equals("true") ? 1:0);
+            });
+        }
+
+        //是否关联品牌
+        if(channelMapAceeptVo.getIsBrand() != null && !channelMapAceeptVo.getIsBrand().equals("")){
+            queryWrapper.and(wdInfoQueryWrapper -> {
+                wdInfoQueryWrapper.eq("is_brand",channelMapAceeptVo.getIsTelephone().equals("true") ? 1:0);
+            });
+        }
+
         //店龄
         if(channelMapAceeptVo.getStoreAge() != null && !channelMapAceeptVo.getStoreAge().equals("")){
             queryWrapper.and(wdInfoQueryWrapper -> {
@@ -763,6 +777,7 @@ public class ChannelMapServiceImpl implements ChannelMapService {
             });
         }
 
+
         //地区过滤
         queryWrapper.and(wdInfoQueryWrapper -> {
             wdInfoQueryWrapper.in("addr_code", wdAddrCode);
@@ -790,21 +805,6 @@ public class ChannelMapServiceImpl implements ChannelMapService {
             });
         }
 
-
-        //是否关联品牌
-        if(channelMapAceeptVo.getIsBrand() != null && !channelMapAceeptVo.getIsBrand().equals("")){
-            queryWrapper.and(wdInfoQueryWrapper -> {
-                wdInfoQueryWrapper.isNotNull("brand_name");
-            });
-        }
-
-        //是否有联系方式
-        if(channelMapAceeptVo.getIsTelephone() != null && !channelMapAceeptVo.getIsTelephone().equals("")){
-            queryWrapper.and(wdInfoQueryWrapper -> {
-                wdInfoQueryWrapper.isNotNull("teletphone");
-            });
-        }
-
         //搜索字段
         if (channelMapAceeptVo.getSearchText() != null && !channelMapAceeptVo.getSearchText() .trim().equals("")) {
             queryWrapper.and(originWdInfoQueryWrapper -> {