yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

repaired bugs

Browse Source
This commit is contained in:
wen 2022-01-26 12:02:46 +08:00
parent 1852958fcb
commit 04fafe47e2
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java
View File

@ -96,10 +96,15 @@ public class XhpcCardServiceImpl implements IXhpcCardService {
dataDTO.setDeviceName(tIccardDevice.getDevname()); dataDTO.setDeviceName(tIccardDevice.getDevname());
dataDTO.setDeviceType(tIccardDevice.getDevtype()); dataDTO.setDeviceType(tIccardDevice.getDevtype());
dataDTO.setDeviceNumber(tIccardDevice.getSerialnumber()); dataDTO.setDeviceNumber(tIccardDevice.getSerialnumber());
TIccardUsers tIccardUser = tIccardUsersMapper.selectByPrimaryKey(tIccardDevice.getCorpindex()); Integer corpindex = tIccardDevice.getCorpindex();
dataDTO.setGrantOperator(tIccardUser.getUsername()); if (corpindex != null) {
TIccardUsers tIccardUser = tIccardUsersMapper.selectByPrimaryKey(tIccardDevice.getCorpindex());
dataDTO.setGrantOperator(tIccardUser.getUsername());
}
dataDTO.setType(tIccardDevice.getType()); dataDTO.setType(tIccardDevice.getType());
listOfAuthorizedDevices.getData().add(dataDTO);
} }
listOfAuthorizedDevices.setTotalItems(tIccardDeviceList.size());
return R.ok(listOfAuthorizedDevices); return R.ok(listOfAuthorizedDevices);
} }

2
xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardDeviceMapper.xml
View File

@ -127,6 +127,6 @@
<update id="updateCardDeviceStatusIsDel"> <update id="updateCardDeviceStatusIsDel">
update t_iccard_device update t_iccard_device
set del_flag = 1 set del_flag = 1
where serialNumber = #{deviceId} where id = #{deviceId}
</update> </update>
</mapper> </mapper>