修改卡日志分页问题

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
          */

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()));

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>