token 获取用户ID

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/mapper/QrBoxMappingMapper.java

@@ -63,7 +63,7 @@ public interface QrBoxMappingMapper extends BaseMapper<QrBoxMapping> {
      * @param req
      * @return
      */
-    List<ActivationRecordVO> getActivationRecord(@Param("req") ActivationRecordReq req);
+    List<ActivationRecordVO> getActivationRecord(@Param("req") ActivationRecordReq req,@Param("id") Long id);
 
     /**
      * 查询激活详情

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/ActivationRecordReq.java

@@ -21,6 +21,4 @@ public class ActivationRecordReq implements Serializable {
     @ApiModelProperty(value = "月份")
     private String month;
 
-    @ApiModelProperty(value = "当前登陆人ID")
-    private Long userId;
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrBoxMappingServiceImpl.java

@@ -13,6 +13,7 @@ import com.abi.qms.platform.dto.req.*;
 import com.abi.qms.platform.dto.res.*;
 import com.abi.qms.platform.infrastructure.util.AssertUtil;
 import com.abi.qms.platform.infrastructure.util.PageUtil;
+import com.abi.qms.platform.infrastructure.util.TokenUtil;
 import com.abi.qms.platform.infrastructure.util.UserUtil;
 import com.abi.qms.platform.service.QrBoxMappingService;
 import com.abi.task.common.api.exception.BusinessException;
@@ -235,10 +236,11 @@ public class QrBoxMappingServiceImpl implements QrBoxMappingService {
         Integer isMainAccount = userUtil.getWholeUser().getIsMainAccount();
 
         ActivationRecordRes res = new ActivationRecordRes();
+        Long id = TokenUtil.getUser().getId();
         if (isMainAccount.equals(1)) {
-            req.setUserId(null);
+            id = null;
         }
-        List<ActivationRecordVO> recordVOList = qrBoxMappingMapper.getActivationRecord(req);
+        List<ActivationRecordVO> recordVOList = qrBoxMappingMapper.getActivationRecord(req,id);
         List<ActivationRecordRes.ActivationRecordBean> beanList = PojoConverterUtils.copyList(recordVOList, ActivationRecordRes.ActivationRecordBean.class);
         res.setActivationRecordBeanList(beanList);
         res.setIsMainAccount(isMainAccount);

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrBoxMappingMapper.xml

@@ -140,8 +140,8 @@
             <if test="req.month != null and req.month !=''">
                 AND DATE_FORMAT(qbm.active_time,'%Y-%m') = #{req.month}
             </if>
-            <if test="req.userId != null and req.userId !=''">
-                AND ui.id =#{req.userId}
+            <if test="id != null">
+                AND ui.id =#{id}
             </if>
         </where>
         ORDER BY qbm.active_time DESC