From 04fafe47e2f05955dff511c81579fa957eb72440 Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Wed, 26 Jan 2022 12:02:46 +0800 Subject: [PATCH] repaired bugs --- .../com/xhpc/card/service/impl/XhpcCardServiceImpl.java | 9 +++++++-- .../src/main/resources/mapper/TIccardDeviceMapper.xml | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) 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 46a80712..7071d16d 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 @@ -96,10 +96,15 @@ public class XhpcCardServiceImpl implements IXhpcCardService { dataDTO.setDeviceName(tIccardDevice.getDevname()); dataDTO.setDeviceType(tIccardDevice.getDevtype()); dataDTO.setDeviceNumber(tIccardDevice.getSerialnumber()); - TIccardUsers tIccardUser = tIccardUsersMapper.selectByPrimaryKey(tIccardDevice.getCorpindex()); - dataDTO.setGrantOperator(tIccardUser.getUsername()); + Integer corpindex = tIccardDevice.getCorpindex(); + if (corpindex != null) { + TIccardUsers tIccardUser = tIccardUsersMapper.selectByPrimaryKey(tIccardDevice.getCorpindex()); + dataDTO.setGrantOperator(tIccardUser.getUsername()); + } dataDTO.setType(tIccardDevice.getType()); + listOfAuthorizedDevices.getData().add(dataDTO); } + listOfAuthorizedDevices.setTotalItems(tIccardDeviceList.size()); return R.ok(listOfAuthorizedDevices); } diff --git a/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardDeviceMapper.xml b/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardDeviceMapper.xml index 4de0f1b8..414f0700 100644 --- a/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardDeviceMapper.xml +++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardDeviceMapper.xml @@ -127,6 +127,6 @@ update t_iccard_device set del_flag = 1 - where serialNumber = #{deviceId} + where id = #{deviceId} \ No newline at end of file