1.修改循环依赖

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

@@ -38,6 +38,7 @@ import org.springblade.system.cache.DictBizCache;
 import org.springblade.system.entity.DictBiz;
 import org.springblade.system.feign.ISysClient;
 import org.springblade.system.feign.IUserClient;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -53,22 +54,29 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service
-@AllArgsConstructor
 public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientMapper, BasicdataClientEntity> implements IBasicdataClientService {
 
 
-	private final IBasicdataHistoricalContractService basicdataHistoricalContractService;
+	@Autowired
-	private final IBasicdataStoreContactService basicdataStoreContactService; //联系人
+	private  IBasicdataHistoricalContractService basicdataHistoricalContractService;
-	private final IBasicdataStoreBusinessService basicdataStoreBusinessService;
+	@Autowired
-	private final IBasicdataTripartiteMallService basicdataTripartiteMallService; //三方商场
+	private  IBasicdataStoreContactService basicdataStoreContactService; //联系人
-	private final IBasicdataStorageServicesService basicdataStorageServicesService; //服务仓
+	@Autowired
-	private final IBasicdataBrandService basicdataBrandService; //品牌
+	private  IBasicdataStoreBusinessService basicdataStoreBusinessService;
-	private final IBasicdataStoreBrandService basicdataStoreBrandService; //品牌
+	@Autowired
-	private final IBasicdataWarehouseService warehouseService;
+	private  IBasicdataTripartiteMallService basicdataTripartiteMallService; //三方商场
+	@Autowired
+	private  IBasicdataStorageServicesService basicdataStorageServicesService; //服务仓
+	@Autowired
+	private  IBasicdataBrandService basicdataBrandService; //品牌
+	@Autowired
+	private  IBasicdataStoreBrandService basicdataStoreBrandService; //品牌
+	@Autowired
+	private  IBasicdataWarehouseService warehouseService;
 //	private final IBasicdataClientUserService basicdataClientUserService;
 
-
+	@Autowired
-	private final IUserClient userClient;
+	private  IUserClient userClient;
 
 	@Override
 	public IPage<BasicdataClientVO> selectBasicdataClientPage(IPage<BasicdataClientVO> page, BasicdataClientVO basicdataClient) {

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

@@ -25,6 +25,7 @@ import org.springblade.system.cache.DictBizCache;
 import org.springblade.system.entity.User;
 import org.springblade.system.entity.UserInfo;
 import org.springblade.system.feign.IUserClient;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.security.NoSuchAlgorithmException;
@@ -33,16 +34,19 @@ import java.util.List;
 
 @Slf4j
 @Service
-@AllArgsConstructor
 public class BasicdataClientUserServiceImpl extends BaseServiceImpl<BasicdataClientUserMapper, BasicdataClientUserEntity> implements IBasicdataClientUserService {
 
-	private final IUserClient userClient;
+	@Autowired
+	private  IUserClient userClient;
 
-	private final IBasicdataClientService basicdataClientService;
+	@Autowired
+	private  IBasicdataClientService basicdataClientService;
 
-	private final IBasicdataStorageServicesService basicdataStorageServicesService;
+	@Autowired
+	private  IBasicdataStorageServicesService basicdataStorageServicesService;
 
-	private final IBasicdataWarehouseService basicdataWarehouseService;
+	@Autowired
+	private  IBasicdataWarehouseService basicdataWarehouseService;
 
 	@Override
 	public List<BasicdataClientUserEntity> getBasicdataClientUserEntityListByUserId(Long userId) {

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

@@ -50,6 +50,7 @@ import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.system.cache.DictBizCache;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.feign.IDeptClient;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -63,23 +64,23 @@ import java.util.stream.Collectors;
  * @since 2023-05-15
  */
 @Service
-@AllArgsConstructor
 @Log4j2
 public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWarehouseMapper, BasicdataWarehouseEntity> implements IBasicdataWarehouseService {
 
-	private final BasicdataWarehouseMapper warehouseMapper;
+	@Autowired
-
+	private BasicdataWarehouseMapper warehouseMapper;
-	private final BasicdataGoodsAreaMapper goodsAreaMapper;
+	@Autowired
-
+	private BasicdataGoodsAreaMapper goodsAreaMapper;
-	private final IBasicdataWarehouseClient basicdataWarehouseService;
+	@Autowired
-
+	private IBasicdataWarehouseClient basicdataWarehouseService;
-	private final IDeptClient deptClient;
+	@Autowired
-
+	private IDeptClient deptClient;
-	private final BladeRedis redis;
+	@Autowired
-
+	private BladeRedis redis;
-	private final IBasicdataClientUserService basicdataClientUserService;
+	@Autowired
-
+	private IBasicdataClientUserService basicdataClientUserService;
-	private final BasicdataStorageServicesMapper basicdataStorageServicesMapper;
+	@Autowired
+	private BasicdataStorageServicesMapper basicdataStorageServicesMapper;
 
 
 //	private