From 0d5a84d599cbfbd77b5663e592603f938b54409e Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 07 一月 2026 11:31:33 +0800
Subject: [PATCH] 【市一】调整mapper获取ordid
---
ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml | 42 ++++++++++-----------
ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml | 5 +-
ruoyi-system/src/main/resources/mapper/system/BaseUserInfoMapper.xml | 2 -
ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml | 5 +-
ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml | 5 +-
ruoyi-system/src/main/resources/mapper/system/EquipmentinfoMapper.xml | 3 -
ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml | 5 +-
ruoyi-system/src/main/resources/mapper/system/SmsParamMapper.xml | 2 -
8 files changed, 32 insertions(+), 37 deletions(-)
diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
index d5aabcf..752fc5a 100644
--- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
+++ b/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
@@ -60,7 +60,6 @@
<select id="selectGenTableList" parameterType="GenTable" resultMap="GenTableResult">
<include refid="selectGenTableVo"/>
WHERE 1=1
-
<if test="tableName != null and tableName != ''">
AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
</if>
@@ -73,7 +72,9 @@
<if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
AND date_format(create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
</if>
-
+ <if test="orgid != null and orgid != ''">
+ AND orgid = #{orgid}
+ </if>
</select>
<select id="selectDbTableList" parameterType="GenTable" resultMap="GenTableResult">
diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
index 0dd6b83..db370cf 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
@@ -367,26 +367,31 @@
select user_id, role_id, orgid
FROM healthy_user_role
WHERE 1=1
-
- <if test="hisUserId != null ">and user_id = #{hisUserId}</if>
-
+ <if test="hisUserId != null ">
+ AND user_id = #{hisUserId}
+ </if>
+ <if test="orgid != null and orgid != ''">
+ AND orgid = #{orgid}
+ </if>
</select>
<select id="yhyksxx" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserDeptResult">
select user_id , user_code , dept_type ,dept_code,dept_name,deptparent,del_flag,orgid
FROM healthy_user_dept
WHERE 1=1
-
- AND user_id != 'admin'
- <if test="hisUserId != null ">and user_id = #{hisUserId}</if>
-
+ AND user_id != 'admin'
+ <if test="hisUserId != null ">
+ AND user_id = #{hisUserId}
+ </if>
+ <if test="orgid != null and orgid != ''">
+ AND orgid = #{orgid}
+ </if>
</select>
<select id="selectPatArchiveList" parameterType="com.smartor.domain.PatArchive" resultMap="PatArchiveResult">
<include refid="selectPatArchiveVo"/>
- WHERE 1=1
-
+ WHERE 1=1
<if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
<if test="idcardno != null and idcardno != ''">and idcardno = #{idcardno}</if>
<if test="sourcefrom != null ">and sourcefrom = #{sourcefrom}</if>
@@ -423,9 +428,6 @@
and to_char(last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') <= #{lastEndTime}
</if>
<if test="pageSize != null and pageSize!='' ">and rownum<#{pageSize}</if>
-
-
-
</select>
@@ -499,8 +501,6 @@
FROM
healthy_inhosp b
WHERE 1=1
-
-
<if test="startOutHospTime != null ">
and to_char(b.endtime, 'YYYY-MM-DD HH24:MI:SS') >=to_char(#{startOutHospTime},'YYYY-MM-DD HH24:MI:SS')
</if>
@@ -529,7 +529,6 @@
<if test="lastEndTime != null and lastEndTime != ''">
and to_char(last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') <= #{lastEndTime}
</if>
-
</select>
@@ -557,8 +556,6 @@
mainsuit
from healthy_outhosp
WHERE 1=1
-
-
<if test="beginTime != null ">
and to_char(admitdate, 'YYYY-MM-DD HH24:MI:SS') >= to_char(#{beginTime}, 'YYYY-MM-DD HH24:MI:SS')
</if>
@@ -571,7 +568,9 @@
<if test="lastEndTime != null and lastEndTime != ''">
and to_char(last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') <= #{lastEndTime}
</if>
-
+ <if test="orgid != null and orgid != ''">
+ AND orgid = #{orgid}
+ </if>
</select>
@@ -585,7 +584,6 @@
icdpym
from healthy_disease
WHERE 1=1
-
<if test="icdcode != null and icdcode != ''">and icdcode = #{icdcode}</if>
<if test="lastflag != null and lastflag != ''">and lastflag = #{lastflag}</if>
<if test="chimedflag != null and chimedflag != ''">and chimedflag = #{chimedflag}</if>
@@ -596,7 +594,6 @@
<if test="pid != null ">and pid = #{pid}</if>
<if test="guid != null and guid != ''">and guid = #{guid}</if>
<if test="hisIcdid != null and hisIcdid != ''">and his_icdid = #{hisIcdid}</if>
-
</select>
@@ -607,7 +604,6 @@
u.birthday,u.orgid,u.job_phone,u.phonenumber, u.sex, u.status
from healthy_user u
WHERE 1=1
-
<if test="userId != null and userId != 0">
AND u.user_id = #{userId}
</if>
@@ -638,7 +634,9 @@
<if test="phonenumber != null and phonenumber != ''">
AND u.phonenumber like concat('%', #{phonenumber}, '%')
</if>
-
+ <if test="orgid != null and orgid != ''">
+ AND u.orgid = #{orgid}
+ </if>
</select>
<select id="selectDeptList" parameterType="com.ruoyi.common.core.domain.entity.SysDept" resultMap="SysDeptResult">
diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
index 112dee1..4b5a699 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
@@ -23,7 +23,6 @@
<select id="selectJobLogList" parameterType="com.ruoyi.quartz.domain.SysJobLog" resultMap="SysJobLogResult">
<include refid="selectJobLogVo"/>
WHERE 1=1
-
<if test="jobName != null and jobName != ''">
AND job_name like concat('%', #{jobName}, '%')
</if>
@@ -42,7 +41,9 @@
<if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
and date_format(create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
</if>
-
+ <if test="orgid != null and orgid != ''">
+ AND orgid = #{orgid}
+ </if>
</select>
<select id="selectJobLogAll" resultMap="SysJobLogResult">
diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml
index 5ebb1d0..9777b36 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml
@@ -28,7 +28,6 @@
<select id="selectJobList" parameterType="SysJob" resultMap="SysJobResult">
<include refid="selectJobVo"/>
WHERE 1=1
-
<if test="jobName != null and jobName != ''">
AND job_name like concat('%', #{jobName}, '%')
</if>
@@ -41,7 +40,9 @@
<if test="invokeTarget != null and invokeTarget != ''">
AND invoke_target like concat('%', #{invokeTarget}, '%')
</if>
-
+ <if test="orgid != null and orgid != ''">
+ AND orgid = #{orgid}
+ </if>
</select>
<select id="selectJobAll" resultMap="SysJobResult">
diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseUserInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseUserInfoMapper.xml
index 76209e2..7c2138a 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BaseUserInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BaseUserInfoMapper.xml
@@ -77,7 +77,6 @@
resultMap="BaseUserInfoResult">
<include refid="selectBaseUserInfoVo"/>
WHERE 1=1
-
<if test="usercode != null and usercode != ''">and usercode = #{usercode}</if>
<if test="account != null and account != ''">and account = #{account}</if>
<if test="guid != null and guid != ''">and guid = #{guid}</if>
@@ -105,7 +104,6 @@
<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
<if test="deptpermission != null and deptpermission != ''">and deptpermission = #{deptpermission}</if>
<if test="wardpermission != null and wardpermission != ''">and wardpermission = #{wardpermission}</if>
-
</select>
<select id="selectBaseUserInfoByUserid" parameterType="Long" resultMap="BaseUserInfoResult">
diff --git a/ruoyi-system/src/main/resources/mapper/system/EquipmentinfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/EquipmentinfoMapper.xml
index 2a66ac6..6a74947 100644
--- a/ruoyi-system/src/main/resources/mapper/system/EquipmentinfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/EquipmentinfoMapper.xml
@@ -28,7 +28,6 @@
<select id="selectEquipmentinfoList" parameterType="Equipmentinfo" resultMap="EquipmentinfoResult">
<include refid="selectEquipmentinfoVo"/>
WHERE 1=1
-
<if test="devtype != null "> and devtype = #{devtype}</if>
<if test="equipmentname != null and equipmentname != ''"> and equipmentname like concat('%', #{equipmentname}, '%')</if>
<if test="modnum != null and modnum != ''"> and modnum = #{modnum}</if>
@@ -41,7 +40,7 @@
<if test="storePlace != null and storePlace != ''"> and storePlace = #{storePlace}</if>
<if test="technData != null and technData != ''"> and technData = #{technData}</if>
<if test="statusid != null "> and statusid = #{statusid}</if>
-
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
</select>
<select id="selectEquipmentinfoById" parameterType="Long" resultMap="EquipmentinfoResult">
diff --git a/ruoyi-system/src/main/resources/mapper/system/SmsParamMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SmsParamMapper.xml
index 5d4fd03..0d60874 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SmsParamMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SmsParamMapper.xml
@@ -28,7 +28,6 @@
<select id="selectSmsParamList" parameterType="SmsParam" resultMap="SmsParamResult">
<include refid="selectSmsParamVo"/>
WHERE 1=1
-
<if test="paramname != null and paramname != ''"> and paramname like concat('%', #{paramname}, '%')</if>
<if test="paramval != null and paramval != ''"> and paramval = #{paramval}</if>
<if test="descirbe != null and descirbe != ''"> and descirbe = #{descirbe}</if>
@@ -36,7 +35,6 @@
<if test="isupload != null "> and isupload = #{isupload}</if>
<if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
<if test="orgid != null "> and orgid = #{orgid}</if>
-
</select>
<select id="selectSmsParamByParamid" parameterType="Long" resultMap="SmsParamResult">
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
index b6af70b..67c107e 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
@@ -43,7 +43,6 @@
<select id="selectDictDataList" parameterType="SysDictData" resultMap="SysDictDataResult">
<include refid="selectDictDataVo"/>
WHERE 1=1
-
<if test="dictType != null and dictType != ''">
AND dict_type = #{dictType}
</if>
@@ -55,10 +54,10 @@
</if>
<if test="guid != null and guid != ''">
AND guid = #{guid}
- </if> <if test="orgid != null and orgid != ''">
+ </if>
+ <if test="orgid != null and orgid != ''">
AND orgid = #{orgid}
</if>
-
order by dict_sort asc
</select>
--
Gitblit v1.9.3