diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java index 274ab75..1bd631e 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java @@ -95,7 +95,7 @@ public class SupCompanyController { @AuthRuleAnnotation("") @GetMapping("api/pur/supCompany/getRoId") public BaseResponse getRoId(String companyId) { - CustomerInfoEntity customerInfoEntity = customerInfoService.selectById(companyId); + UserCompanyEntity customerInfoEntity = customerInfoService.selectById(companyId); return ResultVOUtils.success(customerInfoEntity); } diff --git a/src/main/java/com/glxp/api/dao/auth/CustomerInfoDao.java b/src/main/java/com/glxp/api/dao/auth/CustomerInfoDao.java index 88fdfa1..40424ee 100644 --- a/src/main/java/com/glxp/api/dao/auth/CustomerInfoDao.java +++ b/src/main/java/com/glxp/api/dao/auth/CustomerInfoDao.java @@ -1,5 +1,6 @@ package com.glxp.api.dao.auth; import com.glxp.api.entity.auth.CustomerInfoEntity; +import com.glxp.api.entity.sup.UserCompanyEntity; import org.apache.ibatis.annotations.Mapper; @@ -10,6 +11,7 @@ public interface CustomerInfoDao { boolean updateCustomerInfo(CustomerInfoEntity customerInfoEntity); - CustomerInfoEntity selectById(String customerId); + UserCompanyEntity selectByUserId(String customerId); + CustomerInfoEntity selectById(String customerId); } diff --git a/src/main/java/com/glxp/api/entity/sup/UserCompanyEntity.java b/src/main/java/com/glxp/api/entity/sup/UserCompanyEntity.java index ab9bd60..1c73801 100644 --- a/src/main/java/com/glxp/api/entity/sup/UserCompanyEntity.java +++ b/src/main/java/com/glxp/api/entity/sup/UserCompanyEntity.java @@ -105,5 +105,6 @@ public class UserCompanyEntity implements Serializable { private String reason; + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/req/purchase/FilterUserCompanyRequest.java b/src/main/java/com/glxp/api/req/purchase/FilterUserCompanyRequest.java index ed74fc9..e896be2 100644 --- a/src/main/java/com/glxp/api/req/purchase/FilterUserCompanyRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/FilterUserCompanyRequest.java @@ -9,7 +9,8 @@ import java.util.List; @Data public class FilterUserCompanyRequest extends ListPageRequest { - private String customerId; + private String id; +// private String customerId; private String companyName; private String creditNum; private Integer checkStatus; diff --git a/src/main/java/com/glxp/api/service/auth/CustomerInfoService.java b/src/main/java/com/glxp/api/service/auth/CustomerInfoService.java index 0fd5c94..bcf7ee1 100644 --- a/src/main/java/com/glxp/api/service/auth/CustomerInfoService.java +++ b/src/main/java/com/glxp/api/service/auth/CustomerInfoService.java @@ -2,13 +2,14 @@ package com.glxp.api.service.auth; import com.glxp.api.entity.auth.CustomerInfoEntity; +import com.glxp.api.entity.sup.UserCompanyEntity; public interface CustomerInfoService { boolean updateCustomerInfo(CustomerInfoEntity customerInfoEntity); - CustomerInfoEntity selectById(String customerId); + UserCompanyEntity selectById(String customerId); /** * 根据客户ID查询客户信息 diff --git a/src/main/java/com/glxp/api/service/auth/impl/CustomerInfoServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/CustomerInfoServiceImpl.java index c020ffc..8147c41 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/CustomerInfoServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/CustomerInfoServiceImpl.java @@ -5,6 +5,7 @@ import com.glxp.api.dao.auth.CustomerInfoDao; import com.glxp.api.entity.auth.CustomerInfoEntity; +import com.glxp.api.entity.sup.UserCompanyEntity; import com.glxp.api.service.auth.CustomerInfoService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -25,8 +26,8 @@ public class CustomerInfoServiceImpl implements CustomerInfoService { return customerInfoDao.updateCustomerInfo(customerInfoEntity); } @Override - public CustomerInfoEntity selectById(String customerId) { - return customerInfoDao.selectById(customerId); + public UserCompanyEntity selectById(String customerId) { + return customerInfoDao.selectByUserId(customerId); } @Override public CustomerInfoEntity findByCustomerId(String customerId) { diff --git a/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml b/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml index 15ad9b0..d1cf4fb 100644 --- a/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml +++ b/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml @@ -4,11 +4,19 @@ + +