1.修改循环依赖3

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java

@@ -30,6 +30,7 @@ import com.logpm.basicdata.entity.BasicdataStorageServicesEntity;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.excel.BasicdataWarehouseExcel;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
+import com.logpm.basicdata.mapper.BasicdataClientUserMapper;
 import com.logpm.basicdata.mapper.BasicdataGoodsAreaMapper;
 import com.logpm.basicdata.mapper.BasicdataStorageServicesMapper;
 import com.logpm.basicdata.mapper.BasicdataWarehouseMapper;
@@ -71,14 +72,13 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 	private BasicdataWarehouseMapper warehouseMapper;
 	@Autowired
 	private BasicdataGoodsAreaMapper goodsAreaMapper;
-	@Autowired
-	private IBasicdataWarehouseClient basicdataWarehouseService;
+
 	@Autowired
 	private IDeptClient deptClient;
 	@Autowired
 	private BladeRedis redis;
 	@Autowired
-	private IBasicdataClientUserService basicdataClientUserService;
+	private BasicdataClientUserMapper basicdataClientUserMapper;
 	@Autowired
 	private BasicdataStorageServicesMapper basicdataStorageServicesMapper;
 
@@ -107,7 +107,7 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 
 	@Override
 	public List<BasicdataWarehouseEntity> getWarehouseList() {
-		List<BasicdataWarehouseEntity> myWatchWarehouse = basicdataWarehouseService.getMyWatchWarehouse();
+		List<BasicdataWarehouseEntity> myWatchWarehouse = getMyWatchWarehouse();
 		if (myWatchWarehouse.size() > 0) {
 			return myWatchWarehouse;
 		}
@@ -173,7 +173,7 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 
 			// 当前这登录的用户为商场用户
 			// 根据当前登录人查询商场信息
-			List<BasicdataClientUserEntity> basicdataClientUserEntityListByUserIds = basicdataClientUserService.getBasicdataClientUserEntityListByUserId(AuthUtil.getUserId());
+			List<BasicdataClientUserEntity> basicdataClientUserEntityListByUserIds = basicdataClientUserMapper.getBasicdataClientUserEntityListByUserId(user.getUserId());
 			List clientIds = null;
 			if (Func.isNotEmpty(basicdataClientUserEntityListByUserIds)) {
 				clientIds = basicdataClientUserEntityListByUserIds.stream().map(BasicdataClientUserEntity::getClientId).collect(Collectors.toList());