From f50da3afc73bc458640677c198bb7c99de5b2fe5 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期一, 09 三月 2026 17:33:45 +0800
Subject: [PATCH] fix(mybatis): 修正createUser和updateUser填充值类型空值处理
---
src/main/resources/mapper/staff/SchemeApplicableStaffMapper.xml | 48 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/mapper/staff/SchemeApplicableStaffMapper.xml b/src/main/resources/mapper/staff/SchemeApplicableStaffMapper.xml
index 4f2952d..1652dd6 100644
--- a/src/main/resources/mapper/staff/SchemeApplicableStaffMapper.xml
+++ b/src/main/resources/mapper/staff/SchemeApplicableStaffMapper.xml
@@ -2,19 +2,39 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.staff.mapper.SchemeApplicableStaffMapper">
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.staff.pojo.SchemeApplicableStaff">
- <id column="id" property="id" />
- <result column="title" property="title" />
- <result column="dept_ids" property="deptIds" />
- <result column="staff_names" property="staffNames" />
- <result column="staff_ids" property="staffIds" />
- <result column="insurance_types" property="insuranceTypes" />
- <result column="remark" property="remark" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- <result column="create_user" property="createUser" />
- <result column="update_user" property="updateUser" />
- </resultMap>
+ <!-- 鍩虹瀛楁鏌ヨ -->
+ <sql id="schemeColumns">
+ id, title, dept_ids, staff_names, staff_ids,
+ insurance_types, remark, create_time, update_time,
+ create_user, update_user
+ </sql>
+
+ <!-- 鏍规嵁浜哄憳ID鏌ヨ绀句繚鏂规 -->
+ <select id="selectSchemeByStaffId" resultType="com.ruoyi.staff.pojo.SchemeApplicableStaff">
+ SELECT
+ <include refid="schemeColumns"/>
+ FROM
+ scheme_applicable_staff
+ WHERE
+ 1 = 1
+ <!-- 鏍稿績锛氬尮閰峴taff_ids涓寘鍚洰鏍囦汉鍛業D鐨勮褰� -->
+ AND FIND_IN_SET(#{staffId}, staff_ids)
+ <!-- 鍙�夛細澧炲姞鏈夋晥鐘舵�佽繃婊わ紙濡傛灉琛ㄤ腑鏈夌姸鎬佸瓧娈碉級 -->
+ <!-- AND status = 1 -->
+ ORDER BY
+ create_time DESC
+ </select>
+
+ <!-- 鏌ヨ鏂规瀵瑰簲鐨勬槑缁� -->
+ <select id="selectDetailBySchemeId" resultType="com.ruoyi.staff.pojo.SchemeInsuranceDetail">
+ SELECT
+ id, scheme_id, insurance_type, payment_base,
+ use_basic_salary, personal_ratio, personal_fixed,
+ create_time, update_time, create_user, update_user
+ FROM
+ scheme_insurance_detail
+ WHERE
+ scheme_id = #{schemeId}
+ </select>
</mapper>
--
Gitblit v1.9.3