From 51b404075cceb226245744e31c0cdbe8d28ac757 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 5 Feb 2025 15:45:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=8B=A5=E6=9C=89=E8=80=85=E5=90=8D=E5=AD=97?=
 =?UTF-8?q?=E5=92=8C=E5=B7=A5=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lowcode/service/impl/QrCodeServiceImpl.java    | 14 ++++++++++++++
 src/main/resources/mapper/FieldRecordMapper.xml    |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/hxgk/lowcode/service/impl/QrCodeServiceImpl.java b/src/main/java/com/hxgk/lowcode/service/impl/QrCodeServiceImpl.java
index 88b1f4b..3bd6d70 100644
--- a/src/main/java/com/hxgk/lowcode/service/impl/QrCodeServiceImpl.java
+++ b/src/main/java/com/hxgk/lowcode/service/impl/QrCodeServiceImpl.java
@@ -2,9 +2,11 @@ package com.hxgk.lowcode.service.impl;
 
 import com.hxgk.lowcode.mapper.FieldRecordMapper;
 import com.hxgk.lowcode.model.entity.CustomerFormView;
+import com.hxgk.lowcode.model.entity.ManCont;
 import com.hxgk.lowcode.model.entity.response.QrCodeDetailsResponseEntity;
 import com.hxgk.lowcode.service.CustomerFormViewService;
 import com.hxgk.lowcode.service.QrCodeService;
+import com.hxgk.lowcode.service.UserService;
 import com.hxgk.lowcode.utils.QRCodeUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +23,8 @@ public class QrCodeServiceImpl implements QrCodeService {
     CustomerFormViewService customerFormViewService;
     @Autowired
     FieldRecordMapper fieldRecordMapper;
+    @Autowired
+    UserService userService;
 
     @Override
     public String generateQrCodeByCfid(String cfid) {
@@ -122,6 +126,16 @@ public class QrCodeServiceImpl implements QrCodeService {
                         //currentFieldsMap.put("qrCodeBase64","二维码"+"!@#@!"+currentBase64);
 
                     }
+                    for (Map.Entry<String, String> entry : currentFieldsMap.entrySet()) {
+                        String key = entry.getKey();
+                        if (key.contains("owner")) {
+                            //System.out.println(entry.getValue());
+
+                            String manContKey = entry.getValue().split("!@#@!")[1];
+                            ManCont manContByKey = userService.getManContByKey(manContKey);
+                            entry.setValue("拥有者"+"!@#@!"+manContByKey.getName()+"("+manContByKey.getNumber()+")");
+                        }
+                    }
                     qrCodeDetailsResponseEntity.setBufferedImage(currentBase64);
                     qrCodeDetailsResponseEntity.setFieldsMap(currentFieldsMap);
                     qrCodeDetailsResponseEntity.setGroupName((String)appAndGroupNameMap.get("groupName"));
diff --git a/src/main/resources/mapper/FieldRecordMapper.xml b/src/main/resources/mapper/FieldRecordMapper.xml
index 8f48042..73519bd 100644
--- a/src/main/resources/mapper/FieldRecordMapper.xml
+++ b/src/main/resources/mapper/FieldRecordMapper.xml
@@ -193,7 +193,7 @@
         select
 
         <foreach collection="fields" index="index" item="item" separator="," >
-            COALESCE(${item}, '') as ${item}
+            COALESCE(`${item}`, '') as `${item}`
         </foreach>
 
         from ${asfFormName} where states = 1 and