功能提交： 给用户注册指定用户属性

bug 提交： 修改杜魏的加款mapper文件

modules/admin/src/main/java/com/fire/admin/mapper/SysUserMapper.java

@@ -19,7 +19,7 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface SysUserMapper extends BaseMapper<SysUser> {
 
-    @Insert("insert into sys_user (username,password,dept_id,job_id,phone,email,avatar,lock_flag) values (#{username},#{password},#{deptId},#{jobId},#{phone},#{email},#{avatar},#{lockFlag})")
+    @Insert("insert into sys_user (username,password,dept_id,job_id,phone,email,avatar,lock_flag,type) values (#{username},#{password},#{deptId},#{jobId},#{phone},#{email},#{avatar},#{lockFlag},#{type})")
     @Options(useGeneratedKeys = true, keyProperty = "userId", keyColumn = "user_id")
     boolean insertUser(SysUser sysUser);
 
@@ -33,5 +33,4 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     IPage<SysUser> getUserVosPage(Page page, @Param("query") UserDTO userDTO);
 
 
-
 }

modules/admin/src/main/resources/mapper/AdditionalPaymentMapper.xml

@@ -37,10 +37,7 @@
     </resultMap>
 
     <sql id="customerPayment">
-        pay
-        .
-        id
-        ,
+        pay.id  ,
         pay.card_no,
         pay.bank_deposit,
         pay.account,
@@ -52,8 +49,7 @@
         pay.relation_id,
         pay.distinguish,
         pay.undo,
-        c.customer_name,
-        cs.supplier_name
+        c.customer_name
     </sql>
 
     <select id="selectAddiPayCustomerPageInfo" resultMap="ResultMap">
@@ -71,9 +67,26 @@
         ORDER BY pay.time DESC
     </select>
 
+
+    <sql id="supplerPayment">
+        pay.id  ,
+        pay.card_no,
+        pay.bank_deposit,
+        pay.account,
+        pay.payer,
+        pay.amount,
+        pay.certificate,
+        pay.time,
+        pay.payment_account,
+        pay.relation_id,
+        pay.distinguish,
+        pay.undo,
+        cs.supplier_name
+    </sql>
+
     <select id="getSupplierAddPayPageInfo" resultMap="ResultMap">
         SELECT
-        <include refid="customerPayment"/>
+        <include refid="supplerPayment"/>
         FROM
         additional_payment AS pay
         LEFT JOIN channel_supplier AS cs ON pay.relation_id=cs.supplier_id

modules/admin/src/main/resources/mapper/SysUserMapper.xml

@@ -17,6 +17,7 @@
         <result column="update_time" property="updateTime"/>
         <result column="lock_flag" property="lockFlag"/>
         <result column="del_flag" property="delFlag"/>
+        <result column="type" property="type"/>
         <collection property="roleList" ofType="com.fire.dto.system.SysRole"
                     select="com.fire.admin.mapper.SysRoleMapper.listRolesByUserId"
                     column="user_id">
@@ -35,6 +36,7 @@
         `user`.update_time,
         `user`.del_flag,
         `user`.lock_flag,
+        `user`.type,
         d.name AS deptName
         FROM
         sys_user AS `user`
@@ -49,6 +51,9 @@
                     #{item, jdbcType=INTEGER}
                 </foreach>
             </if>
+            <if test="query.type !=null and auery.type !=''">
+                and `user`.type=#{query.type}
+            </if>
             and `user`.del_flag = '0'
         </where>
         ORDER BY `user`.create_time DESC