diff --git a/pom.xml b/pom.xml index 13a7e09..0ebe177 100644 --- a/pom.xml +++ b/pom.xml @@ -113,16 +113,12 @@ 1.0-SNAPSHOT - - cn.com.tenlion - interface-building-pictures - 1.0-SNAPSHOT - - cn.com.tenlion - module-building-pictures - 1.0-SNAPSHOT + org.springframework + spring-beans + 5.3.3 + compile @@ -130,6 +126,14 @@ module-material-store 1.0-SNAPSHOT + + + cn.com.tenlion + module-building-pictures + 1.0-SNAPSHOT + compile + + 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 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 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 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}