From 42d48937c652af3322d96fb85d4daade2c0f57c1 Mon Sep 17 00:00:00 2001
From: ly19960718 <1622779752@qq.com>
Date: Thu, 3 Jun 2021 18:23:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8D=E7=89=87=E6=95=B0=E6=8D=AE=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 20 +++++++++++--------
 .../usercolumndata/UserColumnDataDTO.java     |  1 +
 .../impl/TemplatePersonServiceImpl.java       |  6 +++---
 .../templateperson/templatePerson-mapper.xml  |  5 ++---
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 13a7e09..0ebe177 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,16 +113,12 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>cn.com.tenlion</groupId>
-            <artifactId>interface-building-pictures</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
 
         <dependency>
-            <groupId>cn.com.tenlion</groupId>
-            <artifactId>module-building-pictures</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>5.3.3</version>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
@@ -130,6 +126,14 @@
             <artifactId>module-material-store</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+
+        <dependency>
+            <groupId>cn.com.tenlion</groupId>
+            <artifactId>module-building-pictures</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/src/main/java/cn/com/tenlion/pojo/dtos/usercolumndata/UserColumnDataDTO.java b/src/main/java/cn/com/tenlion/pojo/dtos/usercolumndata/UserColumnDataDTO.java
index 243ec7c..8fcc908 100644
--- a/src/main/java/cn/com/tenlion/pojo/dtos/usercolumndata/UserColumnDataDTO.java
+++ b/src/main/java/cn/com/tenlion/pojo/dtos/usercolumndata/UserColumnDataDTO.java
@@ -4,6 +4,7 @@ import cn.com.tenlion.materialstore.pojo.dtos.materialdata.MaterialDataDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+
 /**
  *
  * @ClassName: UserColumnDataDTO
diff --git a/src/main/java/cn/com/tenlion/service/templateperson/impl/TemplatePersonServiceImpl.java b/src/main/java/cn/com/tenlion/service/templateperson/impl/TemplatePersonServiceImpl.java
index 65eb23a..e9bf0a1 100644
--- a/src/main/java/cn/com/tenlion/service/templateperson/impl/TemplatePersonServiceImpl.java
+++ b/src/main/java/cn/com/tenlion/service/templateperson/impl/TemplatePersonServiceImpl.java
@@ -398,7 +398,7 @@ public class TemplatePersonServiceImpl extends DefaultBaseService implements ITe
     @Override
     public TemplatePersonDTO get(String templatePersonId) {
         Map<String, Object> params = super.getHashMap(2);
-        params.put("templatePersonId", templatePersonId);
+        params.put("cardPersonId", templatePersonId);
         return get(params);
     }
 
@@ -410,7 +410,7 @@ public class TemplatePersonServiceImpl extends DefaultBaseService implements ITe
     @Override
     public TemplatePersonBO getBO(String templatePersonId) {
         Map<String, Object> params = super.getHashMap(2);
-        params.put("templatePersonId", templatePersonId);
+        params.put("cardPersonId", templatePersonId);
         return getBO(params);
     }
 
@@ -422,7 +422,7 @@ public class TemplatePersonServiceImpl extends DefaultBaseService implements ITe
     @Override
     public TemplatePersonPO getPO(String templatePersonId) {
         Map<String, Object> params = super.getHashMap(2);
-        params.put("templatePersonId", templatePersonId);
+        params.put("cardPersonId", templatePersonId);
         return getPO(params);
     }
 
diff --git a/src/main/resources/mybatis/mapper/templateperson/templatePerson-mapper.xml b/src/main/resources/mybatis/mapper/templateperson/templatePerson-mapper.xml
index 3cfab4a..4a7efd6 100644
--- a/src/main/resources/mybatis/mapper/templateperson/templatePerson-mapper.xml
+++ b/src/main/resources/mybatis/mapper/templateperson/templatePerson-mapper.xml
@@ -200,13 +200,12 @@
             t1.is_main,
             t1.card_width,
             t1.card_height,
-            t1.qrcode_id,
-            1
+            t1.qrcode_id
         FROM
         card_template_person t1
         WHERE
         t1.is_delete = 0
-        AND card_person_id = #{cardPersonId}
+        AND t1.card_person_id = #{cardPersonId}
     </select>
 
     <!-- 详情 -->