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 + type = 0 and createTime >= #{logStartTime}