Procházet zdrojové kódy

新增部门BUG修复

anderx před 1 rokem
rodič
revize
a736c05851

+ 30 - 24
src/main/java/com/goafanti/common/mapper/DepartmentMapper.xml

@@ -50,33 +50,36 @@
     delete from department
     where id = #{id,jdbcType=VARCHAR}
   </delete>
-  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.Department" useGeneratedKeys="true">
-    insert into department (create_id, create_time, update_time,
-      deleted_sign, `name`, `type`,
-      manager_id, dep_no, super_id,
-      remarks, `status`, abbreviation,
-      finance_id, province, working_hours_type,
-      hide_sign, lvl, current_amount,
-      subordinate_amount, total_amount, retrial_finance_id,
-      approval, approval_aid, expense_finance_id,
-      expense_retrial_finance_examine, ceo_examine,
-      cfo_examine, vice_ceo_examine, cashier_examine
-      )
-    values (#{createId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
-      #{deletedSign,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR},
-      #{managerId,jdbcType=VARCHAR}, #{depNo,jdbcType=VARCHAR}, #{superId,jdbcType=VARCHAR},
-      #{remarks,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{abbreviation,jdbcType=VARCHAR},
-      #{financeId,jdbcType=VARCHAR}, #{province,jdbcType=INTEGER}, #{workingHoursType,jdbcType=INTEGER},
-      #{hideSign,jdbcType=INTEGER}, #{lvl,jdbcType=INTEGER}, #{currentAmount,jdbcType=DECIMAL},
-      #{subordinateAmount,jdbcType=DECIMAL}, #{totalAmount,jdbcType=DECIMAL}, #{retrialFinanceId,jdbcType=VARCHAR},
-      #{approval,jdbcType=INTEGER}, #{approvalAid,jdbcType=VARCHAR}, #{expenseFinanceId,jdbcType=VARCHAR},
-      #{expenseRetrialFinanceExamine,jdbcType=INTEGER}, #{ceoExamine,jdbcType=INTEGER},
-      #{cfoExamine,jdbcType=INTEGER}, #{viceCeoExamine,jdbcType=INTEGER}, #{cashierExamine,jdbcType=INTEGER}
-      )
+  <insert id="insert" parameterType="com.goafanti.common.model.Department">
+    insert into department (id, create_id, create_time,
+      update_time, deleted_sign, `name`,
+      `type`, manager_id, dep_no,
+      super_id, remarks, `status`,
+      abbreviation, finance_id, province,
+      working_hours_type, hide_sign, lvl,
+      current_amount, subordinate_amount, total_amount,
+      retrial_finance_id, approval, approval_aid,
+      expense_finance_id, expense_retrial_finance_examine,
+      ceo_examine, cfo_examine, vice_ceo_examine,
+      cashier_examine)
+    values (#{id,jdbcType=VARCHAR}, #{createId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
+      #{updateTime,jdbcType=TIMESTAMP}, #{deletedSign,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR},
+      #{type,jdbcType=VARCHAR}, #{managerId,jdbcType=VARCHAR}, #{depNo,jdbcType=VARCHAR},
+      #{superId,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR},
+      #{abbreviation,jdbcType=VARCHAR}, #{financeId,jdbcType=VARCHAR}, #{province,jdbcType=INTEGER},
+      #{workingHoursType,jdbcType=INTEGER}, #{hideSign,jdbcType=INTEGER}, #{lvl,jdbcType=INTEGER},
+      #{currentAmount,jdbcType=DECIMAL}, #{subordinateAmount,jdbcType=DECIMAL}, #{totalAmount,jdbcType=DECIMAL},
+      #{retrialFinanceId,jdbcType=VARCHAR}, #{approval,jdbcType=INTEGER}, #{approvalAid,jdbcType=VARCHAR},
+      #{expenseFinanceId,jdbcType=VARCHAR}, #{expenseRetrialFinanceExamine,jdbcType=INTEGER},
+      #{ceoExamine,jdbcType=INTEGER}, #{cfoExamine,jdbcType=INTEGER}, #{viceCeoExamine,jdbcType=INTEGER},
+      #{cashierExamine,jdbcType=INTEGER})
   </insert>
-  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.Department" useGeneratedKeys="true">
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.Department">
     insert into department
     <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
       <if test="createId != null">
         create_id,
       </if>
@@ -166,6 +169,9 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
       <if test="createId != null">
         #{createId,jdbcType=VARCHAR},
       </if>