diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcOperatorMapper.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcOperatorMapper.java index 8172891c..d182eaec 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcOperatorMapper.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcOperatorMapper.java @@ -1,6 +1,7 @@ package com.xhpc.card.mapper; import com.xhpc.card.pojo.XhpcOperator; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -36,4 +37,13 @@ public interface XhpcOperatorMapper { */ List selectAll(String tenantId); + /** + * query XhpcOperator according corpNo + * + * @author WH + * @date 2022/3/2 14:57 + * @since version-1.0 + */ + XhpcOperator selectOneByCorpNoAndTenantId(@Param("corpNo") String corpNo, @Param("tenantId") String tenantId); + } \ No newline at end of file diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java index d650d733..286e7bc8 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java @@ -508,7 +508,7 @@ public class XhpcCardServiceImpl implements IXhpcCardService { String log = tIccardLog.getLog(); CardLogInfo cardLogInfo = JSONUtil.toBean(log, CardLogInfo.class); CardLogInfo.CardInfoDTO cardInfo = cardLogInfo.getCardInfo(); - XhpcOperator operator = xhpcOperatorMapper.selectByPrimaryKey(Long.valueOf(cardInfo.getCorpNo())); + XhpcOperator operator = xhpcOperatorMapper.selectOneByCorpNoAndTenantId(cardInfo.getCorpNo(), tokenService.getLoginUser().getSysUser().getTenantId()); dataDTO.setGrantOperatorName(operator.getName()); dataDTO.setCardSerialNumber(tIccardLog.getUniqueid()); dataDTO.setOperate(Integer.valueOf(tIccardLog.getOperate())); diff --git a/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcOperatorMapper.xml b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcOperatorMapper.xml index 32b40468..984e61e8 100644 --- a/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcOperatorMapper.xml +++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcOperatorMapper.xml @@ -60,6 +60,14 @@ FROM xhpc_operator where tenant_id = #{tenantId} + delete from xhpc_operator