userleave

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdLeaveController.java

@@ -136,6 +136,10 @@ public class TdLeaveController extends BaseController
         return toAjax(tdLeaveService.deleteTdLeaveByIds(ids));
     }
 
+    /**
+     * 审核保存
+     */
+    /
     @RequiresPermissions("system:leave:examine")
     @Log(title = "人员离职", businessType = BusinessType.EXAMINE)
     @PostMapping("/examine")
@@ -154,6 +158,7 @@ public class TdLeaveController extends BaseController
     public String examine(@PathVariable("id") Long id,ModelMap mmap){
         TdLeave leaveuser = tdLeaveService.selectTdLeaveById(id);
         mmap.put("leaveuser", leaveuser);
+        mmap.put("sysuser",getSysUser().getLoginName());
         return prefix + "/leaveexamine";
     }
 

ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml

@@ -82,8 +82,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateTdLeave" parameterType="TdLeave">
         update td_leave
         <trim prefix="SET" suffixOverrides=",">
-            <if test="userId != null">userId = #{userId},</if>
+            <if test="userId != null">user_id = #{userId},</if>
-            <if test="userName != null">userName = #{userName},</if>
+            <if test="userName != null">user_name = #{userName},</if>
             <if test="country != null">country = #{country},</if>
             <if test="areaname != null">areaname = #{areaname},</if>
             <if test="leavereason != null">leavereason = #{leavereason},</if>