Merge remote-tracking branch 'origin/dev' into dev

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/ProductInfo.java

@@ -55,6 +55,8 @@ public class ProductInfo implements Serializable {
 
     private PovertyArea povertyArea;
 
+    private String createUserName;
+
     public String getGuid() {
         return guid;
     }
@@ -230,4 +232,12 @@ public class ProductInfo implements Serializable {
     public void setPovertyArea(PovertyArea povertyArea) {
         this.povertyArea = povertyArea;
     }
+
+    public String getCreateUserName() {
+        return createUserName;
+    }
+
+    public void setCreateUserName(String createUserName) {
+        this.createUserName = createUserName;
+    }
 }

carbon-back/carbon-back-service/src/main/resources/carbon/ProductInfoMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hcloud.microserver.system.bank.dao.ProductInfoMapper">
-    <resultMap id="BaseResultMap" type="com.hcloud.microserver.system.facade.carbon.entity.ProductInfo">
+    <resultMap id="BaseResultMap" type="ProductInfo">
         <id column="guid" jdbcType="CHAR" property="guid"/>
         <result column="fk_product_type" jdbcType="CHAR" property="fkProductType"/>
         <result column="fk_carbon_rule" jdbcType="CHAR" property="fkCarbonRule"/>
@@ -20,6 +20,7 @@
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="modified_user" jdbcType="CHAR" property="modifiedUser"/>
         <result column="modified_time" jdbcType="TIMESTAMP" property="modifiedTime"/>
+        <result column="createUserName" jdbcType="VARCHAR" property="createUserName"/>
         <association property="productType" column="fk_product_type"
                      select="com.hcloud.microserver.system.bank.dao.ProductTypeMapper.selectByPrimaryKey"/>
         <association property="povertyArea" column="fk_poverty_area"
@@ -275,8 +276,10 @@
         product.create_user,
         product.create_time,
         product.modified_user,
-        product.modified_time
+        product.modified_time,
+        u.user_name AS createUserName
         from t_product_info product
+        LEFT JOIN sys_user u ON product.create_user = u.user_id
         <where>
             product.state = 1
             <if test="fkPovertyArea != null and fkPovertyArea != ''">