修复bug

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

@@ -145,17 +145,19 @@ public class AttentionPoolServiceImpl implements AttentionPoolService {
             pool.setTelephone(storeWd.getTelephone());
             if (storeWd.getTelephone() == null)
                 pool.setTelephone("");
-            if (storeWd.getBrandId() != null || !storeWd.getBrandId().equals("")){
-                QueryWrapper<Brand> brandQueryWrapper = new QueryWrapper<>();
-                brandQueryWrapper.eq("brand_id",storeWd.getBrandId())
-                    .eq("show_delete",0);
-                Brand brand = brandMapper.selectOne(brandQueryWrapper);
-                if (brand != null){
-                    pool.setBrandId(brand.getBrandId());
-                    pool.setBrandName(brand.getBrandName());
-                }else {
-                    pool.setBrandId("");
-                    pool.setBrandName("");
+            if (storeWd.getBrandId() != null){
+                if (!storeWd.getBrandId().equals("")){
+                    QueryWrapper<Brand> brandQueryWrapper = new QueryWrapper<>();
+                    brandQueryWrapper.eq("brand_id",storeWd.getBrandId())
+                        .eq("show_delete",0);
+                    Brand brand = brandMapper.selectOne(brandQueryWrapper);
+                    if (brand != null){
+                        pool.setBrandId(brand.getBrandId());
+                        pool.setBrandName(brand.getBrandName());
+                    }else {
+                        pool.setBrandId("");
+                        pool.setBrandName("");
+                    }
                 }
             }
         }else {

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

@@ -377,16 +377,18 @@ public class BrandServiceImpl implements BrandService {
     public List<BrandEvolveVo> searchEvolveByMulti(List<String> addrCodes, List<String> typeCodes, List<String> brandIds) {
         // 补齐地址码
         List<String> addrs = new ArrayList<>();
-        if (addrCodes != null || !addrCodes.isEmpty()) {
-            for (String code : addrCodes)
-                addrs.addAll(categoryUtil.getAllOtherAddrCode(code));
+        if (addrCodes != null) {
+            if (!addrCodes.isEmpty())
+                for (String code : addrCodes)
+                    addrs.addAll(categoryUtil.getAllOtherAddrCode(code));
         } else
             addrs = null;
         // 补齐网点分类（犇云）
         List<String> types = new ArrayList<>();
-        if (typeCodes != null || !typeCodes.isEmpty()) {
-            for (String code : typeCodes)
-                types.addAll(categoryUtil.getAllOtherTypeBy(code));
+        if (typeCodes != null) {
+            if (!typeCodes.isEmpty())
+                for (String code : typeCodes)
+                    types.addAll(categoryUtil.getAllOtherTypeBy(code));
         } else
             types = null;
 
@@ -404,16 +406,18 @@ public class BrandServiceImpl implements BrandService {
     public Map<String, List<BrandEvolveVo>> searchEvolveByMulti2Map(List<String> addrCodes, List<String> typeCodes, List<String> brandIds) {
         // 补齐地址码
         List<String> addrs = new ArrayList<>();
-        if (addrCodes != null || !addrCodes.isEmpty()) {
-            for (String code : addrCodes)
-                addrs.addAll(categoryUtil.getAllOtherAddrCode(code));
+        if (addrCodes != null) {
+            if (!addrCodes.isEmpty())
+                for (String code : addrCodes)
+                    addrs.addAll(categoryUtil.getAllOtherAddrCode(code));
         } else
             addrs = null;
         // 补齐网点分类（犇云）
         List<String> types = new ArrayList<>();
-        if (typeCodes != null || !typeCodes.isEmpty()) {
-            for (String code : typeCodes)
-                types.addAll(categoryUtil.getAllOtherTypeBy(code));
+        if (typeCodes != null) {
+            if (!typeCodes.isEmpty())
+                for (String code : typeCodes)
+                    types.addAll(categoryUtil.getAllOtherTypeBy(code));
         } else
             types = null;
 
@@ -456,17 +460,19 @@ public class BrandServiceImpl implements BrandService {
     public List<OpcloseTimeVo> searchOpenTims(List<String> brandIds, List<String> addrCodes, List<String> typeCodeBys) {
         // 补齐地址码
         List<String> addrs = new ArrayList<>();
-        if (addrCodes != null || !addrCodes.isEmpty()) {
-            for (String addr : addrCodes)
-                addrs.addAll(categoryUtil.getAllOtherAddrCode(addr));
+        if (addrCodes != null) {
+            if (!addrCodes.isEmpty())
+                for (String addr : addrCodes)
+                    addrs.addAll(categoryUtil.getAllOtherAddrCode(addr));
         } else
             addrs = null;
 
         // 补齐网点分类（犇云）
         List<String> types = new ArrayList<>();
-        if (typeCodeBys != null || !typeCodeBys.isEmpty()) {
-            for (String type : typeCodeBys)
-                types.addAll(categoryUtil.getAllOtherTypeBy(type));
+        if (typeCodeBys != null) {
+            if (!typeCodeBys.isEmpty())
+                for (String type : typeCodeBys)
+                    types.addAll(categoryUtil.getAllOtherTypeBy(type));
         } else
             types = null;
 
@@ -494,17 +500,19 @@ public class BrandServiceImpl implements BrandService {
     public List<OpcloseTimeVo> searchCloseTims(List<String> brandIds, List<String> addrCodes, List<String> typeCodeBys) {
         // 补齐地址码
         List<String> addrs = new ArrayList<>();
-        if (addrCodes != null || !addrCodes.isEmpty()) {
-            for (String addr : addrCodes)
-                addrs.addAll(categoryUtil.getAllOtherAddrCode(addr));
+        if (addrCodes != null) {
+            if (!addrCodes.isEmpty())
+                for (String addr : addrCodes)
+                    addrs.addAll(categoryUtil.getAllOtherAddrCode(addr));
         } else
             addrs = null;
 
         // 补齐网点分类（犇云）
         List<String> types = new ArrayList<>();
-        if (typeCodeBys != null || !typeCodeBys.isEmpty()) {
-            for (String type : typeCodeBys)
-                types.addAll(categoryUtil.getAllOtherTypeBy(type));
+        if (typeCodeBys != null) {
+            if (!typeCodeBys.isEmpty())
+                for (String type : typeCodeBys)
+                    types.addAll(categoryUtil.getAllOtherTypeBy(type));
         } else
             types = null;
 

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

@@ -42,9 +42,10 @@ public class WdInfoServiceImpl implements WdInfoService {
         List<String> times = new ArrayList<>();
         for (int i = 0; i < 12; i++)
             times.add(LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusMonths(-i).format(DateTimeFormatter.ofPattern("yyyy-MM")));
-        if (addrCodes != null || !addrCodes.isEmpty()) {
-            for (String s : addrCodes)
-                addrs.addAll(categoryUtil.getAllOtherAddrCode(s));
+        if (addrCodes != null) {
+            if (!addrCodes.isEmpty())
+                for (String s : addrCodes)
+                    addrs.addAll(categoryUtil.getAllOtherAddrCode(s));
         } else
             addrs = null;
 
@@ -68,15 +69,17 @@ public class WdInfoServiceImpl implements WdInfoService {
     public List<TimeVo> searchOpenTimes(List<String> addrCodes, List<String> typeCodeBys) {
         // 补齐地址码和类型码
         List<String> addrs = new ArrayList<>();
-        if (addrCodes != null || !addrCodes.isEmpty()) {
-            for (String addr : addrCodes)
-                addrs.addAll(categoryUtil.getAllOtherAddrCode(addr));
+        if (addrCodes != null) {
+            if (!addrCodes.isEmpty())
+                for (String addr : addrCodes)
+                    addrs.addAll(categoryUtil.getAllOtherAddrCode(addr));
         } else
             addrs = null;
         List<String> types = new ArrayList<>();
-        if (typeCodeBys != null || !typeCodeBys.isEmpty()) {
-            for (String type : typeCodeBys)
-                types.addAll(categoryUtil.getAllOtherTypeBy(type));
+        if (typeCodeBys != null) {
+            if (!typeCodeBys.isEmpty())
+                for (String type : typeCodeBys)
+                    types.addAll(categoryUtil.getAllOtherTypeBy(type));
         } else
             types = null;
 
@@ -105,15 +108,17 @@ public class WdInfoServiceImpl implements WdInfoService {
     public List<TimeVo> searchCloseTimes(List<String> addrCodes, List<String> typeCodeBys) {
         // 补齐地址码和类型码
         List<String> addrs = new ArrayList<>();
-        if (addrCodes != null || !addrCodes.isEmpty()) {
-            for (String addr : addrCodes)
-                addrs.addAll(categoryUtil.getAllOtherAddrCode(addr));
+        if (addrCodes != null) {
+            if (!addrCodes.isEmpty())
+                for (String addr : addrCodes)
+                    addrs.addAll(categoryUtil.getAllOtherAddrCode(addr));
         } else
             addrs = null;
         List<String> types = new ArrayList<>();
-        if (typeCodeBys != null || !typeCodeBys.isEmpty()) {
-            for (String type : typeCodeBys)
-                types.addAll(categoryUtil.getAllOtherTypeBy(type));
+        if (typeCodeBys != null) {
+            if (!typeCodeBys.isEmpty())
+                for (String type : typeCodeBys)
+                    types.addAll(categoryUtil.getAllOtherTypeBy(type));
         } else
             types = null;