From df676c1af4f2bd1eb104e9efbf85a71129ff5da3 Mon Sep 17 00:00:00 2001
From: yuyang <YU930814yang>
Date: Thu, 2 Jun 2022 11:44:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=A1=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/xhpc/card/domain/CardLogInfo.java   | 6 ++++++
 .../com/xhpc/card/service/impl/XhpcCardServiceImpl.java   | 8 +++++++-
 .../src/main/resources/mapper/TIccardLogMapper.xml        | 1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/CardLogInfo.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/CardLogInfo.java
index 3f6f8703..180b7b41 100644
--- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/CardLogInfo.java
+++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/CardLogInfo.java
@@ -38,6 +38,12 @@ public class CardLogInfo {
          */
         @JsonProperty("cardNo")
         private String cardNo;
+
+        /**
+         * cardNo
+         */
+        @JsonProperty("corpIndex")
+        private String corpIndex;
         /**
          * cardType
          */
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 4d99042f..fc040d27 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
@@ -570,9 +570,15 @@ public class XhpcCardServiceImpl implements IXhpcCardService {
         for (TIccardLog tIccardLog : dataList) {
             OperateCardsLogResponse.DataDTO dataDTO = new OperateCardsLogResponse.DataDTO();
             String log = tIccardLog.getLog();
+
             CardLogInfo cardLogInfo = JSONUtil.toBean(log, CardLogInfo.class);
             CardLogInfo.CardInfoDTO cardInfo = cardLogInfo.getCardInfo();
-            XhpcOperator operator = xhpcOperatorMapper.selectOneByCorpNoAndTenantId(cardInfo.getCorpNo(), tokenService.getLoginUser().getSysUser().getTenantId());
+            XhpcOperator operator =new XhpcOperator();
+            if(tIccardLog.getOperate()==0){
+                operator = xhpcOperatorMapper.selectOneByCorpNoAndTenantId(cardInfo.getCorpNo(), tokenService.getLoginUser().getSysUser().getTenantId());
+            }else{
+                operator = xhpcOperatorMapper.selectOneByCorpNoAndTenantId(cardInfo.getCorpIndex(), 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/TIccardLogMapper.xml b/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardLogMapper.xml
index 13719af5..be94bcd7 100644
--- a/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardLogMapper.xml
+++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardLogMapper.xml
@@ -47,6 +47,7 @@
         FROM
         t_iccard_log
         <where>
+            type = 0
             <if test="logStartTime!=null and logStartTime!=''">
                 and createTime &gt;= #{logStartTime}
             </if>