From 2377319979235fc30aa21a545c9e8307d2df634e Mon Sep 17 00:00:00 2001
From: "B.E.N.S.O.N" <bensonhkbus@gmail.com>
Date: Tue, 13 Jan 2026 17:24:55 +0800
Subject: [PATCH] Update User QR Code printing

---
 .../ffii/fpsms/modules/user/service/UserQrCodeService.kt    | 6 ++++++
 src/main/resources/qrCodeHandle/qrCodeHandle.jrxml          | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/ffii/fpsms/modules/user/service/UserQrCodeService.kt b/src/main/java/com/ffii/fpsms/modules/user/service/UserQrCodeService.kt
index 12f66a5..e036730 100644
--- a/src/main/java/com/ffii/fpsms/modules/user/service/UserQrCodeService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/user/service/UserQrCodeService.kt
@@ -32,6 +32,10 @@ class UserQrCodeService(
         val qrCodeHandleReport = JasperCompileManager.compileReport(inputStream)
         
         val users = userRepository.findAllById(request.userIds)
+        if (users.isEmpty()) {
+            throw IllegalArgumentException("No users found for the provided user IDs: ${request.userIds}")
+        }
+        
         val fields = mutableListOf<MutableMap<String, Any>>()
         
         for (user in users) {
@@ -39,6 +43,7 @@ class UserQrCodeService(
             
             val staffNo = user.staffNo ?: ""
             val username = user.username ?: "N/A"
+            val name = user.name ?: ""
             
             val qrContentMap = mapOf("staffNo" to staffNo)
             val qrCodeContent = Json.encodeToString(qrContentMap)
@@ -47,6 +52,7 @@ class UserQrCodeService(
             
             field["username"] = username
             field["staffNo"] = staffNo.ifEmpty { "N/A" }
+            field["name"] = name
             field["qrCode"] = qrCodeImage
             
             fields.add(field)
diff --git a/src/main/resources/qrCodeHandle/qrCodeHandle.jrxml b/src/main/resources/qrCodeHandle/qrCodeHandle.jrxml
index b56bc08..2646433 100644
--- a/src/main/resources/qrCodeHandle/qrCodeHandle.jrxml
+++ b/src/main/resources/qrCodeHandle/qrCodeHandle.jrxml
@@ -16,6 +16,7 @@
 	</queryString>
 	<field name="username" class="java.lang.String"/>
 	<field name="staffNo" class="java.lang.String"/>
+	<field name="name" class="java.lang.String"/>
 	<field name="qrCode" class="java.awt.Image"/>
 	<background>
 		<band splitType="Stretch"/>
@@ -31,7 +32,7 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="54" isBold="true" fontName="微軟正黑體" pdfEncoding="Identity-H" isPdfEmbedded="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{username}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{name}]]></textFieldExpression>
 			</textField>
 			<image>
 				<reportElement x="27" y="120" width="500" height="500" uuid="b1a8ee23-9f0f-4014-9996-e0025222dcd2"/>