#update

src/main/resources/mappers/ResetPasswordMapper.xml

@@ -20,14 +20,14 @@
             (UUID(), (SELECT id from account where employee_number =  #{employeeNumber} ), #{note}, NOW())
     </insert>
 
-    <select id="list" resultMap="resetPasswordResultMap" parameterType="map">
+    <select id="list" resultType="Map" parameterType="map">
         SELECT
         rs.id as id,
         rs.account_id as account_id,
         rs.note as note,
         rs.date as date,
         acc.id,
-        acc.name as name,
+        acc.name,
         acc.email as email,
         acc.employee_number as employee_number
 
@@ -38,7 +38,7 @@
                 <when test="searchn == 1"> acc.activation = 1 and acc.employee_number like concat('%',#{search},'%') </when>
             </choose>
         </where>
-        order by date desc limit #{start}, #{perPage}
+        order by rs.id desc limit #{start}, #{perPage}
     </select>
 
     <select id="count" resultType="int" parameterType="map">
@@ -65,6 +65,14 @@
         order by acc.id desc limit #{start}, #{perPage}
 
     </select>
+
+    <update id="passwordUpdate" parameterType="resetPasswordDto">
+        update account a
+        left join reset_password rs on a.id = rs.account_id
+        set a.password = a.employee_number
+        where rs.id = #{id}
+    </update>
+
     <delete id="delete" parameterType="resetPasswordDto">
         delete from reset_password WHERE id = #{id}
     </delete>

src/main/resources/mappers/VendorMapper.xml

@@ -4,6 +4,20 @@
 
 <mapper namespace="com.no1.wms.vendor.VendorMapper">
 
+    <select id="selectAll" resultType="VendorDto">
+        select
+               name,
+               president_name,
+               address,
+               registration_number,
+               email,
+               president_telephone,
+               vendor_manager,
+               vendor_manager_telephone,
+               main_product,
+
+        from  vendor;
+    </select>
 
     <select id="count" parameterType="map" resultType="java.lang.Integer">
         select count(name)