Merge remote-tracking branch 'origin/sit-Carl-V3' into sit-Carl-V3

This commit is contained in:
Carl 2022-02-08 11:44:55 +08:00
commit 615f26159e

View File

@ -71,6 +71,7 @@ public class GoodController {
List<String> tagNameList = new ArrayList<>(); List<String> tagNameList = new ArrayList<>();
int count = 0; int count = 0;
for (String categoryKey : paramMap.keySet()) { for (String categoryKey : paramMap.keySet()) {
System.out.println("categoryKey"+ categoryKey);
if(categoryKey == "categoryName" || categoryKey == "tagFunction" || categoryKey == "tagUsedAge" || categoryKey == "tagBreed" || categoryKey == "tagStatus") { if(categoryKey == "categoryName" || categoryKey == "tagFunction" || categoryKey == "tagUsedAge" || categoryKey == "tagBreed" || categoryKey == "tagStatus") {
switch (categoryKey) { switch (categoryKey) {
case "categoryName": case "categoryName":
@ -95,6 +96,7 @@ public class GoodController {
} }
} }
if(count > 0) { if(count > 0) {
System.out.println("count"+ count);
List<ProductSearchTagEntity> productSearchTagList = productSearchTagService.findAllByCondition(brandNameList, productQueryEntity.getPetType(), tagNameList, productQueryEntity.getTagStatus()); List<ProductSearchTagEntity> productSearchTagList = productSearchTagService.findAllByCondition(brandNameList, productQueryEntity.getPetType(), tagNameList, productQueryEntity.getTagStatus());
List<String> tagCodeList = new ArrayList<>(); List<String> tagCodeList = new ArrayList<>();
for (ProductSearchTagEntity productSearchTagEntity : productSearchTagList) { for (ProductSearchTagEntity productSearchTagEntity : productSearchTagList) {