From 2dbaf8c27aefd052a9a44b371cf50b3530e8ac9e Mon Sep 17 00:00:00 2001 From: houjishuang <46269784@qq.com> Date: Mon, 9 Jun 2025 11:27:54 +0800 Subject: [PATCH] gongyingshangxinxi denglu --- .../base/constant/SupplierRoleConstant.java | 5 ++ ...oller.java => SupplierBaseController.java} | 16 +++- ...aseMapper.java => SupplierBaseMapper.java} | 2 +- .../base/dao/SupplierContactMapper.java | 8 ++ .../ebtp/supplier/base/dto/ContactDTO.java | 2 + ...Service.java => ISupplierBaseService.java} | 7 +- .../impl/CoscoSupplierBaseServiceImpl.java | 44 ----------- .../service/impl/SupplierBaseServiceImpl.java | 78 +++++++++++++++++++ .../supplier/base/vo/ContactSearchVO.java | 10 ++- .../zyhy/ebtp/supplier/feign/SystemApi.java | 18 +++++ .../ebtp/supplier/feign/vo/SysUserRole.java | 36 +++++++++ src/main/resources/application-master.yml | 1 + ...rBaseMapper.xml => SupplierBaseMapper.xml} | 2 +- .../base/dao/mapper/SupplierContactMapper.xml | 7 +- 14 files changed, 183 insertions(+), 53 deletions(-) create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/SupplierRoleConstant.java rename src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/{CoscoSupplierBaseController.java => SupplierBaseController.java} (87%) rename src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/dao/{CoscoSupplierBaseMapper.java => SupplierBaseMapper.java} (90%) rename src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/{ICoscoSupplierBaseService.java => ISupplierBaseService.java} (70%) delete mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/CoscoSupplierBaseServiceImpl.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/SupplierBaseServiceImpl.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/feign/SystemApi.java create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/feign/vo/SysUserRole.java rename src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/{CoscoSupplierBaseMapper.xml => SupplierBaseMapper.xml} (98%) diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/SupplierRoleConstant.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/SupplierRoleConstant.java new file mode 100644 index 0000000..a7dec94 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/constant/SupplierRoleConstant.java @@ -0,0 +1,5 @@ +package com.chinaunicom.zyhy.ebtp.supplier.base.constant; + +public interface SupplierRoleConstant { + String SUPPLIER_ROLE_AGENT_ID = "121"; +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/CoscoSupplierBaseController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/SupplierBaseController.java similarity index 87% rename from src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/CoscoSupplierBaseController.java rename to src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/SupplierBaseController.java index 10acfe2..34ebe36 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/CoscoSupplierBaseController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/SupplierBaseController.java @@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.zyhy.ebtp.supplier.base.dto.ContactDTO; import com.chinaunicom.zyhy.ebtp.supplier.base.dto.CoscoSupplierBaseDTO; import com.chinaunicom.zyhy.ebtp.supplier.base.entity.CoscoSupplierBase; -import com.chinaunicom.zyhy.ebtp.supplier.base.service.ICoscoSupplierBaseService; +import com.chinaunicom.zyhy.ebtp.supplier.base.service.ISupplierBaseService; +import com.chinaunicom.zyhy.ebtp.supplier.base.vo.ContactSearchVO; import com.chinaunicom.zyhy.ebtp.supplier.base.vo.SupplierAccessedOfMyOrgVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -26,10 +28,10 @@ import javax.validation.Valid; @RestController @RequestMapping("/supplier/base") @Api(tags = "中远海运供应商基本信息管理") -public class CoscoSupplierBaseController { +public class SupplierBaseController { @Resource - private ICoscoSupplierBaseService coscoSupplierBaseService; + private ISupplierBaseService coscoSupplierBaseService; /** * 插入新数据 @@ -116,4 +118,12 @@ public class CoscoSupplierBaseController { return BaseResponse.success(coscoSupplierBaseService.getProviderForAgency(providerId)); } + @ApiOperation("selectByMainContactId") + @PostMapping("/supplierContact/agents") + public BaseResponse> selectByMainContactId(ContactSearchVO searchVO) { + + return BaseResponse.success(coscoSupplierBaseService.selectByMainContactId(searchVO)); + } + + } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/dao/CoscoSupplierBaseMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/dao/SupplierBaseMapper.java similarity index 90% rename from src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/dao/CoscoSupplierBaseMapper.java rename to src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/dao/SupplierBaseMapper.java index d6535c3..c31aaae 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/dao/CoscoSupplierBaseMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/dao/SupplierBaseMapper.java @@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Param; * @date 2024-01-29 */ @Mapper -public interface CoscoSupplierBaseMapper extends BaseMapper { +public interface SupplierBaseMapper extends BaseMapper { IPage getAccessedOfMyOrgPage(IPage page,@Param("coscoSupplierBase") SupplierAccessedOfMyOrgVO coscoSupplierBase); CoscoSupplierBaseDTO getProviderForAgency(String providerId); diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/dao/SupplierContactMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/dao/SupplierContactMapper.java index b2ed30a..cb4ef26 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/dao/SupplierContactMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/dao/SupplierContactMapper.java @@ -1,8 +1,14 @@ package com.chinaunicom.zyhy.ebtp.supplier.base.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.chinaunicom.zyhy.ebtp.supplier.base.dto.ContactDTO; import com.chinaunicom.zyhy.ebtp.supplier.base.entity.SupplierContact; +import com.chinaunicom.zyhy.ebtp.supplier.base.vo.ContactSearchVO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 中远海运供应商联系人Mapper接口 @@ -11,4 +17,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface SupplierContactMapper extends BaseMapper { + + IPage selectByMainContactId(IPage page, @Param("searchVO") ContactSearchVO searchVO); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/dto/ContactDTO.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/dto/ContactDTO.java index fe420ef..5c5e261 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/dto/ContactDTO.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/dto/ContactDTO.java @@ -10,4 +10,6 @@ import lombok.experimental.Accessors; @ApiModel(description = "中远海运供应商联系人DTO") public class ContactDTO extends SupplierContact { private String roleCode; + private String roleName; + private Boolean hasAgentRole; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/ICoscoSupplierBaseService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/ISupplierBaseService.java similarity index 70% rename from src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/ICoscoSupplierBaseService.java rename to src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/ISupplierBaseService.java index ab0cc0c..77ed588 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/ICoscoSupplierBaseService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/ISupplierBaseService.java @@ -2,8 +2,10 @@ package com.chinaunicom.zyhy.ebtp.supplier.base.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.chinaunicom.zyhy.ebtp.supplier.base.dto.ContactDTO; import com.chinaunicom.zyhy.ebtp.supplier.base.dto.CoscoSupplierBaseDTO; import com.chinaunicom.zyhy.ebtp.supplier.base.entity.CoscoSupplierBase; +import com.chinaunicom.zyhy.ebtp.supplier.base.vo.ContactSearchVO; import com.chinaunicom.zyhy.ebtp.supplier.base.vo.SupplierAccessedOfMyOrgVO; /** @@ -11,8 +13,11 @@ import com.chinaunicom.zyhy.ebtp.supplier.base.vo.SupplierAccessedOfMyOrgVO; * @author Craft * @date 2024-01-29 */ -public interface ICoscoSupplierBaseService extends IService { +public interface ISupplierBaseService extends IService { IPage getAccessedOfMyOrgPage(SupplierAccessedOfMyOrgVO coscoSupplierBase); CoscoSupplierBaseDTO getProviderForAgency(String providerId); + + IPage selectByMainContactId(ContactSearchVO searchVO); + } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/CoscoSupplierBaseServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/CoscoSupplierBaseServiceImpl.java deleted file mode 100644 index 672d8d3..0000000 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/CoscoSupplierBaseServiceImpl.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.chinaunicom.zyhy.ebtp.supplier.base.service.impl; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; -import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; -import com.chinaunicom.zyhy.ebtp.supplier.base.dao.CoscoSupplierBaseMapper; -import com.chinaunicom.zyhy.ebtp.supplier.base.dto.CoscoSupplierBaseDTO; -import com.chinaunicom.zyhy.ebtp.supplier.base.entity.CoscoSupplierBase; -import com.chinaunicom.zyhy.ebtp.supplier.base.service.ICoscoSupplierBaseService; -import com.chinaunicom.zyhy.ebtp.supplier.base.vo.SupplierAccessedOfMyOrgVO; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; - -/** - * 中远海运供应商基本信息Service实现类 - * @author Craft - * @date 2024-01-29 - */ -@Service -public class CoscoSupplierBaseServiceImpl extends ServiceImpl implements ICoscoSupplierBaseService { - @Resource - private CoscoSupplierBaseMapper coscoSupplierBaseMapper; - @Resource - private IBaseCacheUserService cacheUserService; - @Override - public IPage getAccessedOfMyOrgPage( SupplierAccessedOfMyOrgVO coscoSupplierBase) { - - IPage page= new Page<>(coscoSupplierBase.getPageNo(),coscoSupplierBase.getPageSize()); - BaseCacheUser cacheUser = cacheUserService.getCacheUser(); - if((cacheUser!=null)&&(cacheUser.getDeptId()!=null)){ - coscoSupplierBase.setDeptId(cacheUser.getDeptId()); - } - - return coscoSupplierBaseMapper.getAccessedOfMyOrgPage(page,coscoSupplierBase); - } - - @Override - public CoscoSupplierBaseDTO getProviderForAgency(String providerId) { - return coscoSupplierBaseMapper.getProviderForAgency(providerId); - } -} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/SupplierBaseServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/SupplierBaseServiceImpl.java new file mode 100644 index 0000000..b228e24 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/SupplierBaseServiceImpl.java @@ -0,0 +1,78 @@ +package com.chinaunicom.zyhy.ebtp.supplier.base.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; +import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierRoleConstant; +import com.chinaunicom.zyhy.ebtp.supplier.base.dao.SupplierBaseMapper; +import com.chinaunicom.zyhy.ebtp.supplier.base.dao.SupplierContactMapper; +import com.chinaunicom.zyhy.ebtp.supplier.base.dto.ContactDTO; +import com.chinaunicom.zyhy.ebtp.supplier.base.dto.CoscoSupplierBaseDTO; +import com.chinaunicom.zyhy.ebtp.supplier.base.entity.CoscoSupplierBase; +import com.chinaunicom.zyhy.ebtp.supplier.base.service.ISupplierBaseService; +import com.chinaunicom.zyhy.ebtp.supplier.base.vo.ContactSearchVO; +import com.chinaunicom.zyhy.ebtp.supplier.base.vo.SupplierAccessedOfMyOrgVO; +import com.chinaunicom.zyhy.ebtp.supplier.feign.SystemApi; +import com.chinaunicom.zyhy.ebtp.supplier.feign.vo.SysUserRole; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * 中远海运供应商基本信息Service实现类 + * @author Craft + * @date 2024-01-29 + */ +@Service +public class SupplierBaseServiceImpl extends ServiceImpl implements ISupplierBaseService { + @Resource + private SupplierBaseMapper supplierBaseMapper; + @Resource + private IBaseCacheUserService cacheUserService; + @Resource + private SupplierContactMapper supplierContactMapper; + + @Resource + private SystemApi systemApi; + @Override + public IPage getAccessedOfMyOrgPage( SupplierAccessedOfMyOrgVO coscoSupplierBase) { + + IPage page= new Page<>(coscoSupplierBase.getPageNo(),coscoSupplierBase.getPageSize()); + BaseCacheUser cacheUser = cacheUserService.getCacheUser(); + if((cacheUser!=null)&&(cacheUser.getDeptId()!=null)){ + coscoSupplierBase.setDeptId(cacheUser.getDeptId()); + } + + return supplierBaseMapper.getAccessedOfMyOrgPage(page,coscoSupplierBase); + } + + @Override + public CoscoSupplierBaseDTO getProviderForAgency(String providerId) { + return supplierBaseMapper.getProviderForAgency(providerId); + } + + @Override + public IPage selectByMainContactId(ContactSearchVO searchVO) { + BaseCacheUser cacheUser = cacheUserService.getCacheUser(); + if((cacheUser==null)||(cacheUser.getUserId()==null)){ + throw new RuntimeException("用户未登录"); + } + IPage page= new Page<>(searchVO.getPageNo(),searchVO.getPageSize()); + searchVO.setMainContactAccountId(cacheUser.getUserId()); + page=supplierContactMapper.selectByMainContactId(page,searchVO); + if(page!=null && page.getRecords()!=null && page.getRecords().size()>0){ + for(ContactDTO contactDTO:page.getRecords()){ + SysUserRole userRole = new SysUserRole(contactDTO.getAcount(), SupplierRoleConstant.SUPPLIER_ROLE_AGENT_ID);//(contactDTO.getContactId(),cacheUser.getUserId()); + BaseResponse booleanBaseResponse = systemApi.hasRole(userRole); + contactDTO.setHasAgentRole(booleanBaseResponse.isSuccess()&&(booleanBaseResponse.getData()!=null)?booleanBaseResponse.getData().booleanValue():false); + contactDTO.setRoleCode(booleanBaseResponse.isSuccess()&&(booleanBaseResponse.getData()!=null)?SupplierRoleConstant.SUPPLIER_ROLE_AGENT_ID:""); + } + } + + return page; + + } +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/ContactSearchVO.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/ContactSearchVO.java index 6df8a3b..93a4e9f 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/ContactSearchVO.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/vo/ContactSearchVO.java @@ -1,4 +1,12 @@ package com.chinaunicom.zyhy.ebtp.supplier.base.vo; -public class ContactSearchVO { +import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +@Data +public class ContactSearchVO extends BasePageRequest { + @NotEmpty + String mainContactAccountId ; + String name ; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/feign/SystemApi.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/feign/SystemApi.java new file mode 100644 index 0000000..0c7b1ed --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/feign/SystemApi.java @@ -0,0 +1,18 @@ +package com.chinaunicom.zyhy.ebtp.supplier.feign; + +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; + +import com.chinaunicom.zyhy.ebtp.supplier.feign.vo.SysUserRole; +import io.swagger.annotations.ApiParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import javax.validation.Valid; + +@FeignClient(value = "${mconfig.service-name-system}") +public interface SystemApi { + @PostMapping("/v1/sysuserrole/hasRole") + public BaseResponse hasRole (@Valid @ApiParam(value = "对象数据", required = true) @RequestBody SysUserRole sysUserRole); +} diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/feign/vo/SysUserRole.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/feign/vo/SysUserRole.java new file mode 100644 index 0000000..6bc9334 --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/feign/vo/SysUserRole.java @@ -0,0 +1,36 @@ +package com.chinaunicom.zyhy.ebtp.supplier.feign.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; + +/** +* 实体类 SysUserRole-用户与角色关系表 +* +* @author yss +*/ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Accessors(chain = true) +@ApiModel(value = "SysUserRole对象", description = "用户与角色关系表") +public class SysUserRole implements Serializable { + + private static final long serialVersionUID = 1L; + @NotEmpty + @ApiModelProperty(value = "用户ID") + private String userId; + @NotEmpty + @ApiModelProperty(value = "角色ID") + private String roleId; + + + + +} diff --git a/src/main/resources/application-master.yml b/src/main/resources/application-master.yml index 9dd9fcb..621e302 100644 --- a/src/main/resources/application-master.yml +++ b/src/main/resources/application-master.yml @@ -138,6 +138,7 @@ mconfig: service-name-resps: biz-service-ebtp-resps #标段应答文件 service-name-rsms: biz-service-ebtp-rsms #评审微服务 service-name-tender: biz-service-ebtp-tender #标段投标微服务 + service-name-system: sys-manager-ebtp-project #系统管理微服务 wfSectionNo: '080' wfSectionName: 标段重新评审审批单 diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/SupplierBaseMapper.xml similarity index 98% rename from src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml rename to src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/SupplierBaseMapper.xml index 478a7ad..524bdcf 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/SupplierBaseMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/SupplierContactMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/SupplierContactMapper.xml index 0f7604e..a9330bb 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/SupplierContactMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/SupplierContactMapper.xml @@ -36,13 +36,16 @@ limit 1 - select sub.id, sub.name, sub.phone, sub.email, sub.acount, sub.main, sub.status, sub.supplier_base_id from cosco_supplier_contact mainc,cosco_supplier_base sub where mainc.supplier_base_id =sub.supplier_base_id and mainc.main= '1' and sub.main='0' - and mainc.id = #{id} + and mainc.acount = #{searchVO.mainContactAccountId} + + and sub.name like concat('%', #{searchVO.name}, '%') + \ No newline at end of file