From 7cd9cc73b6bbae05e8fa734e29f6cd435e2599ba Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 28 六月 2023 14:27:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-store/src/main/java/com/java110/store/cmd/shop/ListMyEnteredShopsCmd.java |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/service-store/src/main/java/com/java110/store/cmd/shop/ListMyEnteredShopsCmd.java b/service-store/src/main/java/com/java110/store/cmd/shop/ListMyEnteredShopsCmd.java
index d735631..103ece1 100644
--- a/service-store/src/main/java/com/java110/store/cmd/shop/ListMyEnteredShopsCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/shop/ListMyEnteredShopsCmd.java
@@ -5,29 +5,22 @@
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
-import com.java110.dto.community.CommunityDto;
-import com.java110.dto.roleCommunity.RoleCommunityDto;
+import com.java110.dto.privilege.RoleCommunityDto;
 import com.java110.dto.shop.ShopDto;
 import com.java110.dto.store.StoreDto;
 import com.java110.dto.user.UserDto;
-import com.java110.intf.community.ICommunityInnerServiceSMO;
 import com.java110.intf.mall.IShopInnerServiceSMO;
 import com.java110.intf.store.IStoreV1InnerServiceSMO;
 import com.java110.intf.user.IOrgInnerServiceSMO;
 import com.java110.intf.user.IOrgStaffRelInnerServiceSMO;
 import com.java110.intf.user.IRoleCommunityV1InnerServiceSMO;
 import com.java110.intf.user.IUserV1InnerServiceSMO;
-import com.java110.utils.constant.StateConstant;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
-import com.java110.vo.api.community.ApiCommunityDataVo;
-import com.java110.vo.api.community.ApiCommunityVo;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -35,7 +28,7 @@
 @Java110Cmd(serviceCode = "shop.listMyEnteredShops")
 public class ListMyEnteredShopsCmd extends Cmd {
 
-    @Autowired
+    @Autowired(required = false)
     private IShopInnerServiceSMO shopInnerServiceSMOImpl;
 
     @Autowired
@@ -115,6 +108,7 @@
                     shopDto = new ShopDto();
                     shopDto.setShopId(tmpOrgCommunityDto.getCommunityId());
                     shopDto.setShopName(tmpOrgCommunityDto.getCommunityName());
+                    shops.add(shopDto);
                 }
             } else {
                 shops = new ArrayList<>();

--
Gitblit v1.8.0