|
|
@@ -13,6 +13,7 @@ import com.gubersail.shop.app.corp.mapper.ShopAppCorpsDescMapper;
|
|
|
import com.gubersail.shop.app.corp.service.*;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import org.springblade.common.enums.CommonEnum;
|
|
|
+import org.springblade.common.enums.NumberEnum;
|
|
|
import org.springblade.core.secure.BladeUser;
|
|
|
import org.springblade.core.secure.utils.AuthUtil;
|
|
|
import org.springblade.core.secure.utils.SecureUtil;
|
|
|
@@ -98,7 +99,7 @@ public class ShopAppCorpsDescServiceImpl extends ServiceImpl<ShopAppCorpsDescMap
|
|
|
corpsTypeList.stream().filter(e -> id.equals(e.getId() + "")).findFirst()
|
|
|
.ifPresent(corpsType -> corpsTypeName.append(corpsType.getCname()).append(","));
|
|
|
}
|
|
|
- if (ObjectUtils.isNotNull(corpsTypeName)){
|
|
|
+ if (ObjectUtils.isNotNull(corpsTypeName)) {
|
|
|
String corpsName = corpsTypeName.substring(0, corpsTypeName.length() - 1);
|
|
|
corpsDescVO.setCorpsTypeName(corpsName);
|
|
|
}
|
|
|
@@ -337,7 +338,8 @@ public class ShopAppCorpsDescServiceImpl extends ServiceImpl<ShopAppCorpsDescMap
|
|
|
}
|
|
|
List<Long> storeIds = shopAppCorpsAttnList.stream().map(ShopAppPjCorpsAttn::getPid).collect(Collectors.toList());
|
|
|
List<ShopAppPjCorpsDesc> shopAppPjCorpsDescList = baseMapper.selectList(new LambdaQueryWrapper<ShopAppPjCorpsDesc>()
|
|
|
- .eq(ShopAppPjCorpsDesc::getIsDeleted, 0)
|
|
|
+ .eq(ShopAppPjCorpsDesc::getIsDeleted, NumberEnum.Zero.number)
|
|
|
+ .eq(ShopAppPjCorpsDesc::getEnableOrNot, NumberEnum.ONE.number)
|
|
|
.in(ShopAppPjCorpsDesc::getId, storeIds));
|
|
|
if (org.springframework.util.CollectionUtils.isEmpty(shopAppPjCorpsDescList)) {
|
|
|
return R.data(carOwnerList);
|
liyuan