结构重构

hx-service/pom.xml

@@ -40,6 +40,12 @@
             </dependency>
 
             <dependency>
+                <groupId>org.springblade</groupId>
+                <artifactId>blade-user-api</artifactId>
+                <version>${bladex.version}</version>
+            </dependency>
+
+            <dependency>
                 <groupId>com.fjhx</groupId>
                 <artifactId>common-tool</artifactId>
                 <version>${hx.version}</version>

hx-service/storage-restructure/pom.xml

@@ -31,7 +31,6 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-user-api</artifactId>
-            <version>2.8.2.RELEASE</version>
         </dependency>
 
     </dependencies>

hx-service/storage-restructure/src/main/java/com/fjhx/contract/mapper/PurchaseContractMapper.java

@@ -19,7 +19,6 @@ package com.fjhx.contract.mapper;
 import com.fjhx.contract.entity.PurchaseContract;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
-import org.springblade.core.tenant.annotation.TenantIgnore;
 
 import java.util.List;
 import java.util.Map;
@@ -37,7 +36,6 @@ public interface PurchaseContractMapper extends BaseMapper<PurchaseContract> {
      * @param condition
      * @return
      */
-    @TenantIgnore
     List<PurchaseContract> getList(Map<String, Object> condition);
 
     /**
@@ -46,7 +44,6 @@ public interface PurchaseContractMapper extends BaseMapper<PurchaseContract> {
      * @param condition
      * @return
      */
-    @TenantIgnore
     Integer getListCount(Map<String, Object> condition);
 
     /**
@@ -54,7 +51,6 @@ public interface PurchaseContractMapper extends BaseMapper<PurchaseContract> {
      * @param id
      * @return
      */
-    @TenantIgnore
     PurchaseContract getDetailById(@Param("id") String id);
 
     /**
@@ -62,6 +58,6 @@ public interface PurchaseContractMapper extends BaseMapper<PurchaseContract> {
      * @param condition
      * @return
      */
-    @TenantIgnore
     List<Map<String,Object>> getClassByTechnology(Map<String, Object> condition);
+
 }

hx-service/storage-restructure/src/main/java/com/fjhx/contract/service/impl/PurchaseContractFlowServiceImpl.java

@@ -33,9 +33,6 @@ import com.fjhx.supplier.entity.Supplier;
 import com.fjhx.supplier.service.ISupplierService;
 import org.springblade.common.utils.DateUtil;
 import org.springblade.core.log.exception.ServiceException;
-import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.system.user.entity.User;
-import org.springblade.system.user.feign.IUserClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -59,9 +56,6 @@ public class PurchaseContractFlowServiceImpl extends ServiceImpl<PurchaseContrac
     private ISupplierService iSupplierService;
 
     @Autowired
-    private IUserClient userClient;
-
-    @Autowired
     private IFlowApi flowApi;
 
     /**
@@ -74,7 +68,6 @@ public class PurchaseContractFlowServiceImpl extends ServiceImpl<PurchaseContrac
         if (ObjectUtil.isEmpty(purchaseContract.getSupplierId())) {
             throw new ServiceException("请选择供应商");
         }
-        User user = userClient.infoUser(AuthUtil.getUserIdStr());
         //查询供应商
         Supplier supplier = iSupplierService.getById(purchaseContract.getSupplierId());
         //查询合同