店铺列表

src/main/java/com/cdf/service/impl/ShopServiceImpl.java

@@ -7,11 +7,8 @@ import com.cdf.entity.*;
 import com.cdf.mapper.IShopMapper;
 import com.cdf.request.ShopRequest;
 import com.cdf.response.ShopVo;
-import com.cdf.service.IDeptService;
-import com.cdf.service.IShopCategoryService;
-import com.cdf.service.IShopService;
+import com.cdf.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.cdf.service.IUserService;
 import com.cdf.util.JwtUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -40,6 +37,8 @@ public class ShopServiceImpl extends ServiceImpl<IShopMapper, Shop> implements I
     IShopCategoryService categoryService;
     @Autowired
     IUserService userService;
+    @Autowired
+    IFdkkUserService fdkkUserService;
 
     @Override
     public PageInfo pageList(ShopRequest param) {
@@ -52,7 +51,10 @@ public class ShopServiceImpl extends ServiceImpl<IShopMapper, Shop> implements I
         }
         Integer id = JwtUtil.getId(param.getToken());
         User user = userService.getById(id);
-        param.setDeptId(user.getDeptId());
+
+        FdkkUser fdkkUser = fdkkUserService.getById(user.getFdkkUserId());
+
+        param.setDeptId(fdkkUser.getDeptId());
         List<Integer> deptIds = deptService.getDeptIdsSonList(param.getDeptId());
         wrapper.in(Shop::getDeptId,deptIds);