From 987e38327f849e1b13d8541246dde08d877db0e8 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 07 一月 2026 14:10:43 +0800
Subject: [PATCH] 【市一】调整mapper获取ordid
---
smartor/src/main/resources/mapper/smartor/SchemeTaskMapper.xml | 1
smartor/src/main/resources/mapper/smartor/HeCategoryMapper.xml | 7
smartor/src/main/resources/mapper/smartor/PatHetaskRelevanceMapper.xml | 1
smartor/src/main/resources/mapper/smartor/PatMedWeightMapper.xml | 1
.idea/misc.xml | 7
smartor/src/main/resources/mapper/smartor/HeLibraryAssortMapper.xml | 3
smartor/src/main/resources/mapper/smartor/IvrLibaExtemplateMapper.xml | 2
smartor/src/main/resources/mapper/smartor/IvrSceneIntentMapper.xml | 6
smartor/src/main/resources/mapper/smartor/SvyTaskScriptMapper.xml | 1
smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml | 11
smartor/src/main/resources/mapper/smartor/PatMedBloodsugarMapper.xml | 1
smartor/src/main/resources/mapper/smartor/ServiceSubtaskPreachformMapper.xml | 2
smartor/src/main/resources/mapper/smartor/SvyTaskScriptoptionMapper.xml | 1
smartor/src/main/resources/mapper/smartor/IvrLibaTargetoptionMapper.xml | 6
smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml | 5
smartor/src/main/resources/mapper/smartor/IvrLibaTemplateAssortMapper.xml | 5
smartor/src/main/resources/mapper/smartor/HeLocallibraryMapper.xml | 2
smartor/src/main/resources/mapper/smartor/PatWildcardMapper.xml | 1
smartor/src/main/resources/mapper/smartor/IvrLibaTemplateTagMapper.xml | 2
smartor/src/main/resources/mapper/smartor/SchemeLocallibraryMapper.xml | 1
smartor/src/main/resources/mapper/smartor/SvyLibResultMapper.xml | 1
smartor/src/main/resources/mapper/smartor/IvrLibaExtemplateCategoryMapper.xml | 5
smartor/src/main/resources/mapper/smartor/IvrSceneGlobalconfigMapper.xml | 2
ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml | 4
smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml | 1
smartor/src/main/resources/mapper/smartor/SvyTaskTemplateMapper.xml | 1
smartor/src/main/resources/mapper/smartor/IvrLibIntentMapper.xml | 2
smartor/src/main/resources/mapper/smartor/PatArchivetagMapper.xml | 2
smartor/src/main/resources/mapper/smartor/IvrSceneRecallMapper.xml | 1
smartor/src/main/resources/mapper/smartor/PatMedOuthospProvisionalMapper.xml | 1
smartor/src/main/resources/mapper/smartor/TemplateDeptMapper.xml | 1
smartor/src/main/resources/mapper/smartor/HospitalRecordMapper.xml | 10
smartor/src/main/resources/mapper/smartor/IvrTasksmsMapper.xml | 1
.idea/compiler.xml | 3
smartor/src/main/resources/mapper/smartor/ServiceSubtaskAnswerMapper.xml | 1
smartor/src/main/resources/mapper/smartor/PatMedInspectionItemMapper.xml | 1
ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml | 3
smartor/src/main/resources/mapper/smartor/IvrLibaScriptTargetMapper.xml | 6
smartor/src/main/resources/mapper/smartor/SchemeTriggerruleMapper.xml | 1
smartor/src/main/resources/mapper/smartor/PatArchiveImportMapper.xml | 1
smartor/src/main/resources/mapper/smartor/BaseOrganizationMapper.xml | 4
smartor/src/main/resources/mapper/smartor/IvrLibaExtemplatescriptMapper.xml | 2
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 2
smartor/src/main/resources/mapper/smartor/SvyLibScriptOptionMapper.xml | 1
smartor/src/main/resources/mapper/smartor/SchemeTaskrepeatconfigMapper.xml | 1
ruoyi-system/src/main/resources/mapper/system/SmsParamMapper.xml | 2
smartor/src/main/resources/mapper/smartor/ServiceTaskdeptMapper.xml | 3
smartor/src/main/resources/mapper/smartor/IvrLibaTargetAssortMapper.xml | 5
ruoyi-system/src/main/resources/mapper/system/SmsTempletMapper.xml | 2
smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml | 5
smartor/src/main/resources/mapper/smartor/ServiceCheckMapper.xml | 1
smartor/src/main/resources/mapper/smartor/MedicalHistoryMapper.xml | 1
smartor/src/main/resources/mapper/smartor/SvyLibExceptionMapper.xml | 1
smartor/src/main/resources/mapper/smartor/IvrSceneFlownodeMapper.xml | 2
smartor/src/main/resources/mapper/smartor/IvrScenecategoryMapper.xml | 2
smartor/src/main/resources/mapper/smartor/SvyTopicoptionMapper.xml | 1
smartor/src/main/resources/mapper/smartor/BaseTagMapper.xml | 4
smartor/src/main/resources/mapper/smartor/ServiceThirdDataMapper.xml | 1
smartor/src/main/resources/mapper/smartor/SvyLibTemplateTagMapper.xml | 1
smartor/src/main/resources/mapper/smartor/PatArchivecontactMapper.xml | 5
smartor/src/main/resources/mapper/smartor/HospitalUserinfoMapper.xml | 2
smartor/src/main/resources/mapper/smartor/IvrSceneMapper.xml | 1
ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml | 7
smartor/src/main/resources/mapper/smartor/IvrLibaScriptTagMapper.xml | 2
smartor/src/main/resources/mapper/smartor/IvrLibScriptmodelMapper.xml | 2
ruoyi-system/src/main/resources/mapper/system/EquipmentinfoMapper.xml | 2
smartor/src/main/resources/mapper/smartor/SvyLibTemplateTargetoptionWjxMapper.xml | 5
smartor/src/main/resources/mapper/smartor/ServiceOutPathMapper.xml | 1
smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml | 27 +-
smartor/src/main/resources/mapper/smartor/SchemeTaskrecordCalldetailMapper.xml | 1
smartor/src/main/resources/mapper/smartor/IvrTaskcallrecordMapper.xml | 1
smartor/src/main/resources/mapper/smartor/IvrSceneExecuteconfigMapper.xml | 2
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 20 ++
smartor/src/main/resources/mapper/smartor/PatMedInspectionMapper.xml | 1
smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml | 6
smartor/src/main/resources/mapper/smartor/IvrLibaTemplateMapper.xml | 6
smartor/src/main/resources/mapper/smartor/SvyTaskAnswerMapper.xml | 1
smartor/src/main/resources/mapper/smartor/SvyTaskMapper.xml | 17 +
smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml | 28 ++
smartor/src/main/resources/mapper/smartor/IvrLibIntentcategoryMapper.xml | 2
smartor/src/main/resources/mapper/smartor/BaseTagcategoryMapper.xml | 19 +-
smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml | 1
smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptWjxMapper.xml | 1
smartor/src/main/resources/mapper/smartor/IvrLibScriptMapper.xml | 2
smartor/src/main/resources/mapper/smartor/ServiceSubtaskRecordMapper.xml | 1
smartor/src/main/resources/mapper/smartor/IvrTaskTemplateMapper.xml | 5
smartor/src/main/resources/mapper/smartor/PatSpeciallistMapper.xml | 1
smartor/src/main/resources/mapper/smartor/SchemeTriggersceneMapper.xml | 1
smartor/src/main/resources/mapper/smartor/ServicePatientTempMapper.xml | 1
smartor/src/main/resources/mapper/smartor/PatSatisfactionMapper.xml | 1
smartor/src/main/resources/mapper/smartor/MinioFileMapper.xml | 5
smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml | 9
smartor/src/main/resources/mapper/smartor/IvrLibScriptcategoryMapper.xml | 2
smartor/src/main/resources/mapper/smartor/SysUserImportMapper.xml | 1
smartor/src/main/resources/mapper/smartor/IvrSceneScriptMapper.xml | 1
smartor/src/main/resources/mapper/smartor/SvyCategoryMapper.xml | 6
smartor/src/main/resources/mapper/smartor/Icd10Mapper.xml | 2
smartor/src/main/resources/mapper/smartor/HeLibraryTagMapper.xml | 2
smartor/src/main/resources/mapper/smartor/SvyLibTemplageCategoryMapper.xml | 1
smartor/src/main/resources/mapper/smartor/IvrLibaTargetTagMapper.xml | 2
ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml | 12 +
ruoyi-system/src/main/resources/mapper/system/BaseUserInfoMapper.xml | 6
smartor/src/main/resources/mapper/smartor/Icd10AssociationMapper.xml | 14
smartor/src/main/resources/mapper/smartor/IvrLibaTemplateTargetoptionMapper.xml | 6
smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml | 9 +
smartor/src/main/resources/mapper/smartor/SvyFinishtopicMapper.xml | 1
smartor/src/main/resources/mapper/smartor/SvyLibTemplateWjxMapper.xml | 1
smartor/src/main/resources/mapper/smartor/PatMedHypertensionMapper.xml | 1
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml | 5
smartor/src/main/resources/mapper/smartor/IvrLibaScriptTargetoptionMapper.xml | 6
smartor/src/main/resources/mapper/smartor/PatMedRegistrationMapper.xml | 5
smartor/src/main/resources/mapper/smartor/SvyLibScriptTagMapper.xml | 1
smartor/src/main/resources/mapper/smartor/HNGatherPatArchiveMapper.xml | 7
smartor/src/main/resources/mapper/smartor/IvrSceneScriptmodelMapper.xml | 1
smartor/src/main/resources/mapper/smartor/SchemePlanMapper.xml | 1
smartor/src/main/resources/mapper/smartor/IvrLibaScriptAssortMapper.xml | 9
smartor/src/main/resources/mapper/smartor/PatFilterlistMapper.xml | 1
.idea/vcs.xml | 2
.idea/modules.xml | 2
smartor/src/main/resources/mapper/smartor/IvrSceneFlownodebranchMapper.xml | 2
smartor/src/main/resources/mapper/smartor/SvyLibScriptMapper.xml | 1
smartor/src/main/resources/mapper/smartor/SchemeAutofinshruleMapper.xml | 1
smartor/src/main/resources/mapper/smartor/IvrTaskTemplateTargetoptionMapper.xml | 5
smartor/src/main/resources/mapper/smartor/SvyLibTopicdirectionMapper.xml | 1
ruoyi-system/src/main/resources/mapper/system/SmsRecordsMapper.xml | 1
smartor/src/main/resources/mapper/smartor/IvrTaskVisitResultMapper.xml | 5
smartor/src/main/resources/mapper/smartor/PatArchiveOutMapper.xml | 3
smartor/src/main/resources/mapper/smartor/SvyTopicMapper.xml | 1
ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml | 4
smartor/src/main/resources/mapper/smartor/SchemeCategoryMapper.xml | 1
smartor/src/main/resources/mapper/smartor/SchemeTaskconfigMapper.xml | 1
smartor/src/main/resources/mapper/smartor/SvyTaskTemplateTargetoptionMapper.xml | 5
smartor/src/main/resources/mapper/smartor/PatSpeciallistCategoryMapper.xml | 1
smartor/src/main/resources/mapper/smartor/SvyFinishoptionMapper.xml | 1
smartor/src/main/resources/mapper/smartor/BaseSmsaccountMapper.xml | 1
smartor/src/main/resources/mapper/smartor/PatMedPhysicalMapper.xml | 1
smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml | 1
smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml | 1
smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml | 6
ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml | 4
smartor/src/main/resources/mapper/smartor/SchemeTaskrecordMapper.xml | 1
smartor/src/main/resources/mapper/smartor/SvyTaskSingleMapper.xml | 5
smartor/src/main/resources/mapper/smartor/SvyFinishMapper.xml | 1
ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml | 5
smartor/src/main/resources/mapper/smartor/PatMedDrugMapper.xml | 1
smartor/src/main/resources/mapper/smartor/SvyLibTemplateTargetoptionMapper.xml | 5
smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml | 1
smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml | 1
smartor/src/main/resources/mapper/smartor/IvrSceneFlowMapper.xml | 2
smartor/src/main/resources/mapper/smartor/ServiceTaskdiagMapper.xml | 1
smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml | 5
smartor/src/main/resources/mapper/smartor/SvyLibTopicCategoryMapper.xml | 1
smartor/src/main/resources/mapper/smartor/HeLibraryMapper.xml | 2
smartor/src/main/resources/mapper/smartor/SysUserRole2Mapper.xml | 1
154 files changed, 305 insertions(+), 222 deletions(-)
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 6ef4c26..0de7777 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,5 +17,8 @@
<module name="ruoyi-quartz" />
</profile>
</annotationProcessing>
+ <bytecodeTargetLevel>
+ <module name="ruoyi" target="1.8" />
+ </bytecodeTargetLevel>
</component>
</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 00118d8..9000277 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -7,6 +7,11 @@
<option value="$PROJECT_DIR$/pom.xml" />
</list>
</option>
+ <option name="ignoredFiles">
+ <set>
+ <option value="$PROJECT_DIR$/pom.xml" />
+ </set>
+ </option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
-</project>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 3e40b07..c10d336 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,4 +5,4 @@
<module fileurl="file://$PROJECT_DIR$/ruoyi-admin/ruoyi-admin.iml" filepath="$PROJECT_DIR$/ruoyi-admin/ruoyi-admin.iml" />
</modules>
</component>
-</project>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
- <mapping directory="$PROJECT_DIR$" vcs="Git" />
+ <mapping directory="" vcs="Git" />
</component>
</project>
\ No newline at end of file
diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
index db370cf..10f3c7c 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
@@ -367,6 +367,7 @@
select user_id, role_id, orgid
FROM healthy_user_role
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="hisUserId != null ">
AND user_id = #{hisUserId}
</if>
@@ -379,6 +380,7 @@
select user_id , user_code , dept_type ,dept_code,dept_name,deptparent,del_flag,orgid
FROM healthy_user_dept
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND user_id != 'admin'
<if test="hisUserId != null ">
AND user_id = #{hisUserId}
@@ -392,6 +394,7 @@
<select id="selectPatArchiveList" parameterType="com.smartor.domain.PatArchive" resultMap="PatArchiveResult">
<include refid="selectPatArchiveVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<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>
@@ -501,6 +504,7 @@
FROM
healthy_inhosp b
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<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>
@@ -556,6 +560,9 @@
mainsuit
from healthy_outhosp
WHERE 1=1
+ <if test="orgid != null and orgid != ''">
+ and orgid = #{orgid}
+ </if>
<if test="beginTime != null ">
and to_char(admitdate, 'YYYY-MM-DD HH24:MI:SS') >= to_char(#{beginTime}, 'YYYY-MM-DD HH24:MI:SS')
</if>
@@ -567,9 +574,6 @@
</if>
<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>
@@ -584,6 +588,7 @@
icdpym
from healthy_disease
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<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>
@@ -604,6 +609,7 @@
u.birthday,u.orgid,u.job_phone,u.phonenumber, u.sex, u.status
from healthy_user u
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="userId != null and userId != 0">
AND u.user_id = #{userId}
</if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseUserInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseUserInfoMapper.xml
index 7c2138a..05a042e 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BaseUserInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BaseUserInfoMapper.xml
@@ -77,6 +77,7 @@
resultMap="BaseUserInfoResult">
<include refid="selectBaseUserInfoVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<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>
@@ -92,14 +93,13 @@
<if test="wardid != null and wardid != ''">and wardid = #{wardid}</if>
<if test="wardname != null and wardname != ''">and wardname like concat('%', #{wardname}, '%')</if>
<if test="usertype != null ">and usertype = #{usertype}</if>
- <if test="usertypename != null and usertypename != ''">and usertypename like concat('%', #{usertypename},
- AND '%')
+ <if test="usertypename != null and usertypename != ''">
+ and usertypename like concat('%', #{usertypename},'%')
</if>
<if test="dwpermission != null ">and dwpermission = #{dwpermission}</if>
<if test="isopenlowerorg != null ">and isopenlowerorg = #{isopenlowerorg}</if>
<if test="isopenshareknow != null ">and isopenshareknow = #{isopenshareknow}</if>
<if test="isopengeneraldata != null ">and isopengeneraldata = #{isopengeneraldata}</if>
- <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
<if test="isupload != null ">and isupload = #{isupload}</if>
<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
<if test="deptpermission != null and deptpermission != ''">and deptpermission = #{deptpermission}</if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/EquipmentinfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/EquipmentinfoMapper.xml
index 6a74947..32982d8 100644
--- a/ruoyi-system/src/main/resources/mapper/system/EquipmentinfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/EquipmentinfoMapper.xml
@@ -28,6 +28,7 @@
<select id="selectEquipmentinfoList" parameterType="Equipmentinfo" resultMap="EquipmentinfoResult">
<include refid="selectEquipmentinfoVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<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>
@@ -40,7 +41,6 @@
<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 0d60874..115c614 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SmsParamMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SmsParamMapper.xml
@@ -28,13 +28,13 @@
<select id="selectSmsParamList" parameterType="SmsParam" resultMap="SmsParamResult">
<include refid="selectSmsParamVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<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>
<if test="usestatus != null "> and usestatus = #{usestatus}</if>
<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/SmsRecordsMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SmsRecordsMapper.xml
index a23e8c4..11834f2 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SmsRecordsMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SmsRecordsMapper.xml
@@ -70,7 +70,6 @@
<select id="selectSmsRecordsList" parameterType="com.ruoyi.system.domain.SmsRecords" resultMap="SmsRecordsResult">
<include refid="selectSmsRecordsVo"/>
WHERE 1=1
-
AND del_flag=0
<if test="userid != null and userid != ''">and userid = #{userid}</if>
<if test="username != null and username != ''">and username like concat('%', #{username}, '%')</if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SmsTempletMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SmsTempletMapper.xml
index 57bb6ae..dc28ff9 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SmsTempletMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SmsTempletMapper.xml
@@ -27,7 +27,7 @@
<select id="selectSmsTempletList" parameterType="SmsTemplet" resultMap="SmsTempletResult">
<include refid="selectSmsTempletVo"/>
WHERE 1=1
-
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="templetno != null and templetno != ''"> and templetno = #{templetno}</if>
<if test="templetname != null and templetname != ''"> and templetname like concat('%', #{templetname}, '%')</if>
<if test="templetcontent != null and templetcontent != ''"> and templetcontent = #{templetcontent}</if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
index db41c31..db3b865 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
@@ -37,7 +37,6 @@
<!-- 鏌ヨ鏉′欢 -->
<sql id="sqlwhereSearch">
WHERE 1=1
-
<if test="configId !=null">
and config_id = #{configId}
</if>
@@ -47,7 +46,6 @@
<if test="orgid !=null and orgid != ''">
and orgid = #{orgid}
</if>
-
</sql>
<select id="selectConfig" parameterType="SysConfig" resultMap="SysConfigResult">
@@ -58,6 +56,7 @@
<select id="selectConfigList" parameterType="SysConfig" resultMap="SysConfigResult">
<include refid="selectConfigVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="configName != null and configName != ''">
AND config_name like concat('%', #{configName}, '%')
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
index 509dc05..dc46b02 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
@@ -25,7 +25,9 @@
<select id="selectDictTypeList" parameterType="SysDictType" resultMap="SysDictTypeResult">
<include refid="selectDictTypeVo"/>
WHERE 1=1
-
+ <if test="orgid != null and orgid != ''">
+ and orgid = #{orgid}
+ </if>
<if test="dictName != null and dictName != ''">
AND dict_name like concat('%', #{dictName}, '%')
</if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
index c514824..6c1cc13 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
@@ -26,7 +26,9 @@
<select id="selectLogininforList" parameterType="SysLogininfor" resultMap="SysLogininforResult">
select info_id, user_name, ipaddr, login_location, browser, os, status, msg, login_time from sys_logininfor
WHERE 1=1
-
+ <if test="orgid != null and orgid != ''">
+ and orgid = #{orgid}
+ </if>
<if test="ipaddr != null and ipaddr != ''">
AND ipaddr like concat('%', #{ipaddr}, '%')
</if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index 9702821..0a1c336 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -53,7 +53,9 @@
<select id="selectMenuList" parameterType="SysMenu" resultMap="SysMenuResult">
<include refid="selectMenuVo"/>
WHERE 1=1
-
+ <if test="orgid != null and orgid != ''">
+ AND orgid = #{orgid}
+ </if>
<if test="menuName != null and menuName != ''">
AND menu_name like concat('%', #{menuName}, '%')
</if>
@@ -63,7 +65,6 @@
<if test="status != null and status != ''">
AND status = #{status}
</if>
-
order by parent_id, order_num
</select>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
index c17fd18..411b469 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
@@ -43,7 +43,6 @@
<select id="selectNoticeList" parameterType="SysNotice" resultMap="SysNoticeResult">
<include refid="selectNoticeVo"/>
WHERE 1=1
-
<if test="noticeTitle != null and noticeTitle != ''">
AND notice_title like concat('%', #{noticeTitle}, '%')
</if>
@@ -53,10 +52,9 @@
<if test="createBy != null and createBy != ''">
AND create_by like concat('%', #{createBy}, '%')
</if>
- <if test="orgid != null and orgid != ''">
+ <if test="orgid != null and orgid != ''">
AND orgid = #{orgid}
</if>
-
</select>
<insert id="insertNotice" parameterType="SysNotice">
@@ -79,8 +77,7 @@
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="guid != null and guid != ''">#{guid},</if>
<if test="orgid != null and orgid != ''">#{orgid},</if>
- sysdate()
- )
+ sysdate())
</insert>
<update id="updateNotice" parameterType="SysNotice">
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
index 4bd1410..8f3f761 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
@@ -38,7 +38,9 @@
<select id="selectOperLogList" parameterType="SysOperLog" resultMap="SysOperLogResult">
<include refid="selectOperLogVo"/>
WHERE 1=1
-
+ <if test="orgid != null and orgid != ''">
+ and orgid = #{orgid}
+ </if>
<if test="title != null and title != ''">
AND title like concat('%', #{title}, '%')
</if>
@@ -63,7 +65,6 @@
<if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
and date_format(oper_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
</if>
-
order by oper_id desc
</select>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
index b7a9ac2..beef747 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
@@ -36,7 +36,9 @@
<select id="selectPostList" parameterType="com.ruoyi.system.domain.SysPost" resultMap="SysPostResult">
<include refid="selectPostVo"/>
WHERE 1=1
-
+ <if test="orgid != null and orgid != ''">
+ and orgid = #{orgid}
+ </if>
<if test="postCode != null and postCode != ''">
AND post_code like concat('%', #{postCode}, '%')
</if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 105ca50..49400b1 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -322,7 +322,6 @@
<select id="selectUserByUserNameByCondition" parameterType="String" resultMap="SysUserResult">
<include refid="selectUserVo"/>
WHERE 1=1
-
AND u.del_flag = '0'
<if test="userName != null and userName != ''">
AND u.user_name = #{userName}
@@ -333,7 +332,6 @@
<if test="deptId != null and deptId != ''">
AND u.dept_id = #{deptId}
</if>
-
</select>
<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
diff --git a/smartor/src/main/resources/mapper/smartor/BaseOrganizationMapper.xml b/smartor/src/main/resources/mapper/smartor/BaseOrganizationMapper.xml
index 0e311fa..f818e74 100644
--- a/smartor/src/main/resources/mapper/smartor/BaseOrganizationMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/BaseOrganizationMapper.xml
@@ -85,7 +85,6 @@
resultMap="BaseOrganizationResult">
<include refid="selectBaseOrganizationVo"/>
WHERE 1=1
-
AND del_flag=0
<if test="OrganizationName != null and OrganizationName != ''">
and OrganizationName like concat('%', #{OrganizationName}, '%')
@@ -171,10 +170,9 @@
<if test="guid != null and guid != ''">
and guid = #{guid}
</if>
- <if test="orgid != null ">
+ <if test="orgid != null and orgid != ''">
and orgid = #{orgid}
</if>
-
</select>
<select id="selectBaseOrganizationByID" parameterType="Long"
diff --git a/smartor/src/main/resources/mapper/smartor/BaseSmsaccountMapper.xml b/smartor/src/main/resources/mapper/smartor/BaseSmsaccountMapper.xml
index 6ff4738..6feb6bd 100644
--- a/smartor/src/main/resources/mapper/smartor/BaseSmsaccountMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/BaseSmsaccountMapper.xml
@@ -44,7 +44,6 @@
<select id="selectBaseSmsaccountList" parameterType="BaseSmsaccount" resultMap="BaseSmsaccountResult">
<include refid="selectBaseSmsaccountVo"/>
WHERE 1=1
-
<if test="smsname != null and smsname != ''">and smsname like concat('%', #{smsname}, '%')</if>
<if test="account != null and account != ''">and account = #{account}</if>
<if test="password != null and password != ''">and password = #{password}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/BaseTagMapper.xml b/smartor/src/main/resources/mapper/smartor/BaseTagMapper.xml
index 838fd9d..ef30b37 100644
--- a/smartor/src/main/resources/mapper/smartor/BaseTagMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/BaseTagMapper.xml
@@ -42,7 +42,6 @@
<select id="selectBaseTagList" parameterType="com.smartor.domain.BaseTag" resultMap="BaseTagResult">
<include refid="selectBaseTagVo"/>
WHERE 1=1
-
<if test="tagcategoryid != null ">and tagcategoryid = #{tagcategoryid}</if>
<if test="tagname != null and tagname != ''">and tagname like concat('%', #{tagname}, '%')</if>
<if test="tagdescription != null and tagdescription != ''">and tagdescription = #{tagdescription}</if>
@@ -50,12 +49,10 @@
<if test="isupload != null ">and isupload = #{isupload}</if>
<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
<if test="isenable != null ">and isenable = #{isenable}</if>
-
</select>
<select id="selectBaseTagListByTagname" parameterType="com.smartor.domain.BaseTag" resultMap="BaseTagResult">
<include refid="selectBaseTagVo"/>
WHERE 1=1
-
<if test="tagcategoryid != null ">and tagcategoryid = #{tagcategoryid}</if>
<if test="tagname != null and tagname != ''">and tagname =#{tagname}</if>
<if test="tagdescription != null and tagdescription != ''">and tagdescription = #{tagdescription}</if>
@@ -63,7 +60,6 @@
<if test="isupload != null ">and isupload = #{isupload}</if>
<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
<if test="isenable != null ">and isenable = #{isenable}</if>
-
</select>
<select id="selectBaseTagByTagid" parameterType="Long" resultMap="BaseTagResult">
diff --git a/smartor/src/main/resources/mapper/smartor/BaseTagcategoryMapper.xml b/smartor/src/main/resources/mapper/smartor/BaseTagcategoryMapper.xml
index 946fc07..3dd97da 100644
--- a/smartor/src/main/resources/mapper/smartor/BaseTagcategoryMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/BaseTagcategoryMapper.xml
@@ -41,16 +41,15 @@
resultMap="BaseTagcategoryResult">
<include refid="selectBaseTagcategoryVo"/>
WHERE 1=1
-
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
<if test="pym != null and pym != ''">and pym = #{pym}</if>
<if test="wbm != null and wbm != ''">and wbm = #{wbm}</if>
<if test="isupload != null ">and isupload = #{isupload}</if>
<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
- <if test="categoryname != null and categoryname != ''">and categoryname like concat('%', #{categoryname},
- AND '%')
+ <if test="categoryname != null and categoryname != ''">
+ and categoryname
+ like concat('%', #{categoryname},'%')
</if>
-
</select>
<select id="selectBaseTagcategoryByTagcategoryid" parameterType="Long" resultMap="BaseTagcategoryResult">
@@ -131,11 +130,13 @@
from base_tagcategory a left join base_tag b
on a.tagcategoryid = b.tagcategoryid
WHERE 1=1
-
- <if test="categoryname != null and categoryname != ''">a.categoryname like concat('%', #{categoryname},
- AND '%')
- </if>
-
+ <if test="orgid != null and orgid != ''">
+ and orgid = #{orgid}
+ </if>
+ <if test="categoryname != null and categoryname != ''">
+ and a.categoryname
+ like concat('%', #{categoryname}, '%')
+ </if>
GROUP BY a.tagcategoryid,a.categoryname
</select>
</mapper>
diff --git a/smartor/src/main/resources/mapper/smartor/HNGatherPatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/HNGatherPatArchiveMapper.xml
index 59f240b..c137f5b 100644
--- a/smartor/src/main/resources/mapper/smartor/HNGatherPatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/HNGatherPatArchiveMapper.xml
@@ -368,6 +368,7 @@
select user_id, role_id, orgid
FROM yhyjsxx
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="hisUserId != null ">and user_id = #{hisUserId}</if>
@@ -378,6 +379,7 @@
dept_id,dept_name,deptparent,del_flag,orgid,create_time,create_by,update_time,update_by
FROM yhyksxx
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND user_id != 'admin'
<if test="hisUserId != null ">and user_id = #{hisUserId}</if>
@@ -388,6 +390,7 @@
<select id="selectPatArchiveList" parameterType="com.smartor.domain.PatArchive" resultMap="PatArchiveResult">
<include refid="selectPatArchiveVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
<if test="idcardno != null and idcardno != ''">and idcardno = #{idcardno}</if>
@@ -498,6 +501,7 @@
FROM
cryxx b
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="startOutHospTime != null ">and to_char(b.endtime,'YYMMDD') >=
@@ -557,6 +561,7 @@
mainsuit
from mzxx
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="beginTime != null ">and to_char( admitdate,'YYMMDD') >=
@@ -580,6 +585,7 @@
icdpym
from jbxx
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="icdcode != null and icdcode != ''">and icdcode = #{icdcode}</if>
<if test="lastflag != null and lastflag != ''">and lastflag = #{lastflag}</if>
@@ -603,6 +609,7 @@
u.login_ip, u.login_date, u.create_by, u.create_time, u.remark
from ryxx u
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="userId != null and userId != 0">
AND u.user_id = #{userId}
diff --git a/smartor/src/main/resources/mapper/smartor/HeCategoryMapper.xml b/smartor/src/main/resources/mapper/smartor/HeCategoryMapper.xml
index 933073d..53dc442 100644
--- a/smartor/src/main/resources/mapper/smartor/HeCategoryMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/HeCategoryMapper.xml
@@ -38,14 +38,13 @@
<select id="selectHeCategoryList" parameterType="com.smartor.domain.HeCategory" resultMap="HeCategoryResult">
<include refid="selectHeCategoryVo"/>
WHERE 1=1
-
- <if test="categoryname != null and categoryname != ''">and categoryname like concat('%', #{categoryname},
- AND '%')
+ <if test="categoryname != null and categoryname != ''">
+ and categoryname
+ like concat('%', #{categoryname},'%')
</if>
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
<if test="id != null">and id = #{id}</if>
<if test="pid != null">and pid = #{pid}</if>
-
</select>
<select id="selectHeCategoryById" parameterType="Long" resultMap="HeCategoryResult">
diff --git a/smartor/src/main/resources/mapper/smartor/HeLibraryAssortMapper.xml b/smartor/src/main/resources/mapper/smartor/HeLibraryAssortMapper.xml
index aac6770..95d1749 100644
--- a/smartor/src/main/resources/mapper/smartor/HeLibraryAssortMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/HeLibraryAssortMapper.xml
@@ -43,7 +43,6 @@
resultMap="HeLibraryAssortResult">
<include refid="selectHeLibraryAssortVo"/>
WHERE 1=1
-
AND del_flag != 1
<if test="assortname != null and assortname != ''">and assortname like concat('%', #{assortname}, '%')</if>
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
@@ -53,8 +52,6 @@
<if test="guid != null and guid != ''">and guid = #{guid}</if>
<if test="seqno != null ">and seqno = #{seqno}</if>
<if test="hetype != null ">and hetype = #{hetype}</if>
-
-
order by seqno asc
</select>
diff --git a/smartor/src/main/resources/mapper/smartor/HeLibraryMapper.xml b/smartor/src/main/resources/mapper/smartor/HeLibraryMapper.xml
index 8766d43..b2dc286 100644
--- a/smartor/src/main/resources/mapper/smartor/HeLibraryMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/HeLibraryMapper.xml
@@ -86,7 +86,6 @@
<select id="selectHeLibraryList" parameterType="com.smartor.domain.HeLibrary" resultMap="HeLibraryResult">
<include refid="selectHeLibraryVo"/>
WHERE 1=1
-
AND del_flag=0
<if test="id != null ">and id = #{id}</if>
<if test="classification != null and classification != ''">and classification = #{classification}</if>
@@ -122,7 +121,6 @@
<if test="richText != null and richText != ''">and rich_text = #{richText}</if>
<if test="hetype != null and hetype != ''">and hetype = #{hetype}</if>
<if test="htmlRichText != null and htmlRichText != ''">and html_rich_text = #{htmlRichText}</if>
-
</select>
<select id="selectHeLibraryById" parameterType="Long" resultMap="HeLibraryResult">
diff --git a/smartor/src/main/resources/mapper/smartor/HeLibraryTagMapper.xml b/smartor/src/main/resources/mapper/smartor/HeLibraryTagMapper.xml
index d10bc53..48c737c 100644
--- a/smartor/src/main/resources/mapper/smartor/HeLibraryTagMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/HeLibraryTagMapper.xml
@@ -44,7 +44,6 @@
<select id="selectHeLibraryTagList" parameterType="com.smartor.domain.HeLibraryTag" resultMap="HeLibraryTagResult">
<include refid="selectHeLibraryTagVo"/>
WHERE 1=1
-
AND del_flag=0
<if test="tagcategoryid != null ">and tagcategoryid = #{tagcategoryid}</if>
<if test="tagid != null ">and tagid = #{tagid}</if>
@@ -55,7 +54,6 @@
<if test="pid != null ">and pid = #{pid}</if>
<if test="guid != null and guid != ''">and guid = #{guid}</if>
<if test="tagname != null and tagname != ''">and tagname = #{tagname}</if>
-
</select>
<select id="selectHeLibraryTagById" parameterType="Long" resultMap="HeLibraryTagResult">
diff --git a/smartor/src/main/resources/mapper/smartor/HeLocallibraryMapper.xml b/smartor/src/main/resources/mapper/smartor/HeLocallibraryMapper.xml
index 770b446..01d3e0a 100644
--- a/smartor/src/main/resources/mapper/smartor/HeLocallibraryMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/HeLocallibraryMapper.xml
@@ -62,7 +62,6 @@
resultMap="HeLocallibraryResult">
<include refid="selectHeLocallibraryVo"/>
WHERE 1=1
-
AND del_flag=0
<if test="preachcategoryid != null ">and preachcategoryid = #{preachcategoryid}</if>
<if test="preachname != null and preachname != ''">and preachname like concat('%', #{preachname}, '%')</if>
@@ -84,7 +83,6 @@
<if test="centerlibrarycode != null and centerlibrarycode != ''">and centerlibrarycode =
#{centerlibrarycode}
</if>
-
</select>
<select id="selectHeLocallibraryById" parameterType="Long" resultMap="HeLocallibraryResult">
diff --git a/smartor/src/main/resources/mapper/smartor/HospitalRecordMapper.xml b/smartor/src/main/resources/mapper/smartor/HospitalRecordMapper.xml
index f4ae969..202ea0b 100644
--- a/smartor/src/main/resources/mapper/smartor/HospitalRecordMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/HospitalRecordMapper.xml
@@ -135,7 +135,6 @@
resultMap="HospitalRecordResult">
<include refid="selectHospitalRecordVo"/>
WHERE 1=1
-
<if test="ID != null and ID != ''">and ID = #{ID}</if>
<if test="sourceSystem != null and sourceSystem != ''">and SourceSystem = #{sourceSystem}</if>
<if test="messageID != null and messageID != ''">and MessageID = #{messageID}</if>
@@ -174,8 +173,8 @@
</if>
<if test="encAdmSource != null and encAdmSource != ''">and EncAdmSource = #{encAdmSource}</if>
<if test="encInhostype != null and encInhostype != ''">and EncInhostype = #{encInhostype}</if>
- <if test="encDietName != null and encDietName != ''">and EncDietName like concat('%', #{encDietName},
- AND '%')
+ <if test="encDietName != null and encDietName != ''">
+ and EncDietName like concat('%', #{encDietName},'%')
</if>
<if test="encOuthostype != null and encOuthostype != ''">and EncOuthostype = #{encOuthostype}</if>
<if test="encVisitnum != null and encVisitnum != ''">and EncVisitnum = #{encVisitnum}</if>
@@ -202,8 +201,8 @@
<if test="encHavebaby != null and encHavebaby != ''">and EncHavebaby = #{encHavebaby}</if>
<if test="encDiagList != null and encDiagList != ''">and EncDiagList = #{encDiagList}</if>
<if test="directorCode != null and directorCode != ''">and DirectorCode = #{directorCode}</if>
- <if test="directorName != null and directorName != ''">and DirectorName like concat('%', #{directorName},
- AND '%')
+ <if test="directorName != null and directorName != ''">
+ and DirectorName like concat('%', #{directorName},'%')
</if>
<if test="dncDiagnosisCode != null and dncDiagnosisCode != ''">and EncDiagnosisCode = #{dncDiagnosisCode}
</if>
@@ -215,7 +214,6 @@
</if>
<if test="taskStatus != null and taskStatus != ''">and taskStatus = #{taskStatus}</if>
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
-
</select>
<select id="selectHospitalRecordByID" parameterType="String" resultMap="HospitalRecordResult">
diff --git a/smartor/src/main/resources/mapper/smartor/HospitalUserinfoMapper.xml b/smartor/src/main/resources/mapper/smartor/HospitalUserinfoMapper.xml
index 676a074..5e90d1f 100644
--- a/smartor/src/main/resources/mapper/smartor/HospitalUserinfoMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/HospitalUserinfoMapper.xml
@@ -184,7 +184,6 @@
<select id="selectHospitalUserinfoList" parameterType="HospitalUserinfo" resultMap="HospitalUserinfoResult">
<include refid="selectHospitalUserinfoVo"/>
WHERE 1=1
-
<if test="SourceSystem != null and SourceSystem != ''">and SourceSystem = #{SourceSystem}</if>
<if test="MessageID != null and MessageID != ''">and MessageID = #{MessageID}</if>
<if test="CreateTime != null and CreateTime != ''">and CreateTime = #{CreateTime}</if>
@@ -284,7 +283,6 @@
<if test="Bednur != null and Bednur != ''">and Bednur = #{Bednur}</if>
<if test="Regdoc != null and Regdoc != ''">and Regdoc = #{Regdoc}</if>
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
-
</select>
<select id="selectHospitalUserinfoByID" parameterType="Long" resultMap="HospitalUserinfoResult">
diff --git a/smartor/src/main/resources/mapper/smartor/Icd10AssociationMapper.xml b/smartor/src/main/resources/mapper/smartor/Icd10AssociationMapper.xml
index 5740e88..73171b5 100644
--- a/smartor/src/main/resources/mapper/smartor/Icd10AssociationMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/Icd10AssociationMapper.xml
@@ -60,7 +60,6 @@
resultMap="Icd10AssociationResult">
<include refid="selectIcd10AssociationVo"/>
WHERE 1=1
-
<if test="icd10id != null ">and icd10id = #{icd10id}</if>
<if test="icd10code != null and icd10code != ''">and icd10code = #{icd10code}</if>
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
@@ -73,18 +72,17 @@
<if test="icd10AssortCode != null ">and icd10_assort_code = #{icd10AssortCode}</if>
<if test="icd10AssortName != null and icd10AssortName != ''">and icd10_assort_name = #{icd10AssortName}
</if>
- <if test="chineseMedicineDiagnoseSign != null ">and chinese_medicine_diagnose_sign =
- #{chineseMedicineDiagnoseSign}
+ <if test="chineseMedicineDiagnoseSign != null ">
+ and chinese_medicine_diagnose_sign = #{chineseMedicineDiagnoseSign}
</if>
- <if test="chineseMedicineDiagnoseAssortCode != null and chineseMedicineDiagnoseAssortCode != ''">and
- AND chinese_medicine_diagnose_assort_code = #{chineseMedicineDiagnoseAssortCode}
+ <if test="chineseMedicineDiagnoseAssortCode != null and chineseMedicineDiagnoseAssortCode != ''">
+ and chinese_medicine_diagnose_assort_code = #{chineseMedicineDiagnoseAssortCode}
</if>
- <if test="chineseMedicineDiagnoseAssortName != null and chineseMedicineDiagnoseAssortName != ''">and
- AND chinese_medicine_diagnose_assort_name = #{chineseMedicineDiagnoseAssortName}
+ <if test="chineseMedicineDiagnoseAssortName != null and chineseMedicineDiagnoseAssortName != ''">
+ and chinese_medicine_diagnose_assort_name = #{chineseMedicineDiagnoseAssortName}
</if>
<if test="outpatientUseAssort != null">and outpatient_use_assort = #{outpatientUseAssort}</if>
<if test="inpatientUseAssort != null">and inpatient_use_assort = #{inpatientUseAssort}</if>
-
</select>
<select id="selectIcd10AssociationById" parameterType="Long" resultMap="Icd10AssociationResult">
diff --git a/smartor/src/main/resources/mapper/smartor/Icd10Mapper.xml b/smartor/src/main/resources/mapper/smartor/Icd10Mapper.xml
index 38f107d..ebdd665 100644
--- a/smartor/src/main/resources/mapper/smartor/Icd10Mapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/Icd10Mapper.xml
@@ -46,7 +46,6 @@
<select id="selectIcd10List" parameterType="com.smartor.domain.Icd10" resultMap="Icd10Result">
<include refid="selectIcd10Vo"/>
WHERE 1=1
-
AND del_flag=0
<if test="icdcode != null and icdcode != ''">and icdcode = #{icdcode}</if>
<if test="lastflag != null and lastflag != ''">and lastflag = #{lastflag}</if>
@@ -58,7 +57,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>
<select id="selectIcd10ByIcdid" parameterType="Long" resultMap="Icd10Result">
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibIntentMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibIntentMapper.xml
index 9273335..f1fcb24 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibIntentMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibIntentMapper.xml
@@ -28,7 +28,6 @@
<select id="selectIvrLibIntentList" parameterType="IvrLibIntent" resultMap="IvrLibIntentResult">
<include refid="selectIvrLibIntentVo"/>
WHERE 1=1
-
<if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="intentionname != null and intentionname != ''"> and intentionname like concat('%', #{intentionname}, '%')</if>
<if test="categoryid != null "> and categoryid = #{categoryid}</if>
@@ -36,7 +35,6 @@
<if test="intentionword != null and intentionword != ''"> and intentionword = #{intentionword}</if>
<if test="isupload != null "> and isupload = #{isupload}</if>
<if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
-
</select>
<select id="selectIvrLibIntentByIntentid" parameterType="Long" resultMap="IvrLibIntentResult">
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibIntentcategoryMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibIntentcategoryMapper.xml
index 7ce4e09..e94800a 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibIntentcategoryMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibIntentcategoryMapper.xml
@@ -25,12 +25,10 @@
<select id="selectIvrLibIntentcategoryList" parameterType="IvrLibIntentcategory" resultMap="IvrLibIntentcategoryResult">
<include refid="selectIvrLibIntentcategoryVo"/>
WHERE 1=1
-
<if test="categoryname != null and categoryname != ''"> and categoryname like concat('%', #{categoryname}, '%')</if>
<if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="isupload != null "> and isupload = #{isupload}</if>
<if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
-
</select>
<select id="selectIvrLibIntentcategoryByIntertcatid" parameterType="Long" resultMap="IvrLibIntentcategoryResult">
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibScriptMapper.xml
index 06b68f3..90c6400 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibScriptMapper.xml
@@ -30,7 +30,6 @@
<select id="selectIvrLibScriptList" parameterType="IvrLibScript" resultMap="IvrLibScriptResult">
<include refid="selectIvrLibScriptVo"/>
WHERE 1=1
-
<if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="categoryid != null "> and categoryid = #{categoryid}</if>
<if test="categoryname != null and categoryname != ''"> and categoryname like concat('%', #{categoryname}, '%')</if>
@@ -40,7 +39,6 @@
<if test="speakname != null and speakname != ''"> and speakname like concat('%', #{speakname}, '%')</if>
<if test="isupload != null "> and isupload = #{isupload}</if>
<if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
-
</select>
<select id="selectIvrLibScriptByScriptid" parameterType="Long" resultMap="IvrLibScriptResult">
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibScriptcategoryMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibScriptcategoryMapper.xml
index 7ad5a05..beb2461 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibScriptcategoryMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibScriptcategoryMapper.xml
@@ -25,12 +25,10 @@
<select id="selectIvrLibScriptcategoryList" parameterType="IvrLibScriptcategory" resultMap="IvrLibScriptcategoryResult">
<include refid="selectIvrLibScriptcategoryVo"/>
WHERE 1=1
-
<if test="categoryname != null and categoryname != ''"> and categoryname like concat('%', #{categoryname}, '%')</if>
<if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="isupload != null "> and isupload = #{isupload}</if>
<if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
-
</select>
<select id="selectIvrLibScriptcategoryByCategoryid" parameterType="Long" resultMap="IvrLibScriptcategoryResult">
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibScriptmodelMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibScriptmodelMapper.xml
index 2ec08f6..89ff706 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibScriptmodelMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibScriptmodelMapper.xml
@@ -35,7 +35,6 @@
<select id="selectIvrLibScriptmodelList" parameterType="IvrLibScriptmodel" resultMap="IvrLibScriptmodelResult">
<include refid="selectIvrLibScriptmodelVo"/>
WHERE 1=1
-
<if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="scriptid != null "> and scriptid = #{scriptid}</if>
<if test="speaktype != null "> and speaktype = #{speaktype}</if>
@@ -50,7 +49,6 @@
<if test="isupload != null "> and isupload = #{isupload}</if>
<if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
<if test="speakvariable != null and speakvariable != ''"> and speakvariable = #{speakvariable}</if>
-
</select>
<select id="selectIvrLibScriptmodelByModelid" parameterType="Long" resultMap="IvrLibScriptmodelResult">
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaExtemplateCategoryMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaExtemplateCategoryMapper.xml
index 613cf37..57bfb9e 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaExtemplateCategoryMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaExtemplateCategoryMapper.xml
@@ -41,9 +41,8 @@
resultMap="IvrLibaExtemplateCategoryResult">
<include refid="selectIvrLibaExtemplateCategoryVo"/>
WHERE 1=1
-
- <if test="categoryname != null and categoryname != ''">and categoryname like concat('%', #{categoryname},
- AND '%')
+ <if test="categoryname != null and categoryname != ''">
+ and categoryname like concat('%', #{categoryname},'%')
</if>
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
<if test="isupload != null ">and isupload = #{isupload}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaExtemplateMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaExtemplateMapper.xml
index d8524f6..552e0b1 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaExtemplateMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaExtemplateMapper.xml
@@ -34,7 +34,6 @@
resultMap="IvrLibaExtemplateResult">
<include refid="selectIvrLibaExtemplateVo"/>
WHERE 1=1
-
AND del_flag=0
<if test="extName != null and extName != ''">and extName like concat('%', #{extName}, '%')</if>
<if test="language != null and language != ''">and language = #{language}</if>
@@ -47,7 +46,6 @@
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
<if test="pid != null ">and pid = #{pid}</if>
<if test="guid != null and guid != ''">and guid = #{guid}</if>
-
</select>
<select id="selectIvrLibaExtemplateByID" parameterType="String" resultMap="IvrLibaExtemplateResult">
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaExtemplatescriptMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaExtemplatescriptMapper.xml
index 267177f..d5719d7 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaExtemplatescriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaExtemplatescriptMapper.xml
@@ -57,7 +57,6 @@
resultMap="IvrLibaExtemplatescriptResult">
<include refid="selectIvrLibaExtemplatescriptVo"/>
WHERE 1=1
-
<if test="extID != null">and extID = #{extID}</if>
<if test="switchID != null ">and switchID = #{switchID}</if>
<if test="switchText != null and switchText != ''">and switchText = #{switchText}</if>
@@ -78,6 +77,7 @@
resultMap="IvrLibaExtemplatescriptResult">
<include refid="selectIvrLibaExtemplatescriptVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag = 0
<if test="IDs != null">
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaScriptAssortMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaScriptAssortMapper.xml
index e5af116..e7d96a8 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaScriptAssortMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaScriptAssortMapper.xml
@@ -25,13 +25,14 @@
resultMap="IvrLibaScriptAssortResult">
<include refid="selectIvrLibaScriptAssortVo"/>
WHERE 1=1
-
- <if test="indexAssortName != null and indexAssortName != ''">and index_assort_name like concat('%',
- #{indexAssortName}, '%')
+ <if test="orgid != null and orgid != ''">
+ and orgid = #{orgid}
+ </if>
+ <if test="indexAssortName != null and indexAssortName != ''">
+ and index_assort_name like concat('%',#{indexAssortName}, '%')
</if>
<if test="pid != null ">and pid = #{pid}</if>
and del_flag=0
-
order by seqno asc
</select>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml
index 1e4f6c4..74c1036 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml
@@ -91,13 +91,12 @@
resultMap="IvrLibaScriptResult">
<include refid="selectIvrLibaScriptVo"/>
WHERE 1=1
-
AND del_flag=0
<if test="id != null ">and id = #{id}</if>
<if test="deptIds != null and deptIds != ''">and deptIds = #{deptIds}</if>
<if test="deptNames != null and deptNames != ''">and deptNames like concat('%', #{deptNames}, '%')</if>
- <if test="scriptTopic != null and scriptTopic != ''">and script_topic like concat('%', #{scriptTopic},
- AND '%')
+ <if test="scriptTopic != null and scriptTopic != ''">
+ and script_topic like concat('%', #{scriptTopic},'%')
</if>
<if test="campus != null and campus != ''">and campus = #{campus}</if>
<if test="tag != null and tag != ''">and tag = #{tag}</if>
@@ -134,7 +133,6 @@
<if test="pid != null ">and pid = #{pid}</if>
<if test="guid != null and guid != ''">and guid = #{guid}</if>
<if test="otherdata != null and otherdata != ''">and otherdata = #{otherdata}</if>
-
</select>
<select id="selectIvrLibaScriptByQuestionid" parameterType="String" resultMap="IvrLibaScriptResult">
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaScriptTagMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaScriptTagMapper.xml
index b6f1c9c..5fab684 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaScriptTagMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaScriptTagMapper.xml
@@ -47,7 +47,6 @@
resultMap="IvrLibaScriptTagResult">
<include refid="selectIvrLibaScriptTagVo"/>
WHERE 1=1
-
<if test="tagcategoryid != null ">and tagcategoryid = #{tagcategoryid}</if>
<if test="scriptid != null ">and scriptid = #{scriptid}</if>
<if test="tagid != null ">and tagid = #{tagid}</if>
@@ -57,7 +56,6 @@
<if test="targetid != null ">and targetid = #{targetid}</if>
<if test="pid != null ">and pid = #{pid}</if>
<if test="guid != null and guid != ''">and guid = #{guid}</if>
-
</select>
<select id="selectIvrLibaScriptTagById" parameterType="Long" resultMap="IvrLibaScriptTagResult">
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaScriptTargetMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaScriptTargetMapper.xml
index 24bebec..df37b8e 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaScriptTargetMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaScriptTargetMapper.xml
@@ -71,12 +71,11 @@
resultMap="IvrLibaScriptTargetResult">
<include refid="selectIvrLibaScriptTargetVo"/>
WHERE 1=1
-
<if test="scriptid != null ">and scriptid = #{scriptid}</if>
<if test="targetID != null ">and targetID = #{targetID}</if>
<if test="targetType != null and targetType != ''">and targetType = #{targetType}</if>
- <if test="categoryName != null and categoryName != ''">and categoryName like concat('%', #{categoryName},
- AND '%')
+ <if test="categoryName != null and categoryName != ''">
+ and categoryName like concat('%', #{categoryName},'%')
</if>
<if test="targetValue != null and targetValue != ''">and targetValue = #{targetValue}</if>
<if test="basicRegex != null and basicRegex != ''">and basicRegex = #{basicRegex}</if>
@@ -96,7 +95,6 @@
<if test="warnup != null ">and warnup = #{warnup}</if>
<if test="warndown != null">and warndown = #{warndown}</if>
<if test="picturePath != null and picturePath != ''">and picture_path = #{picturePath}</if>
-
</select>
<select id="selectIvrLibaScriptTargetByQuestionTargetID" parameterType="String"
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaScriptTargetoptionMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaScriptTargetoptionMapper.xml
index 21272ee..5816712 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaScriptTargetoptionMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaScriptTargetoptionMapper.xml
@@ -63,14 +63,13 @@
resultMap="IvrLibaScriptTargetoptionResult">
<include refid="selectIvrLibaScriptTargetoptionVo"/>
WHERE 1=1
-
AND del_flag=0
<if test="targetid != null and targetid != ''">and targetid = #{targetid}</if>
<if test="targetname != null and targetname != ''">and targetname = #{targetname}</if>
<if test="scriptid != null ">and scriptid = #{scriptid}</if>
<if test="targettype != null and targettype != ''">and targettype = #{targettype}</if>
- <if test="categoryName != null and categoryName != ''">and categoryName like concat('%', #{categoryName},
- AND '%')
+ <if test="categoryName != null and categoryName != ''">
+ and categoryName like concat('%', #{categoryName},'%')
</if>
<if test="targetvalue != null and targetvalue != ''">and targetvalue = #{targetvalue}</if>
<if test="targetregex != null and targetregex != ''">and targetregex = #{targetregex}</if>
@@ -93,7 +92,6 @@
<if test="appendflag != null">and appendflag = #{appendflag}</if>
<if test="appenddesc != null">and appenddesc = #{appenddesc}</if>
<if test="picturePath != null">and picture_path = #{picturePath}</if>
-
</select>
<select id="selectIvrLibaScriptTargetoptionByTargetoptionid" parameterType="String"
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetAssortMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetAssortMapper.xml
index 6fc4e72..a474fcf 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetAssortMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetAssortMapper.xml
@@ -25,13 +25,14 @@
resultMap="IvrLibaTargetAssortResult">
<include refid="selectIvrLibaTargetAssortVo"/>
WHERE 1=1
-
+ <if test="orgid != null and orgid != ''">
+ and orgid = #{orgid}
+ </if>
<if test="indexAssortName != null and indexAssortName != ''">and index_assort_name like concat('%',
#{indexAssortName}, '%')
</if>
<if test="pid != null ">and pid = #{pid}</if>
and del_flag=0
-
order by seqno asc
</select>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml
index 51e7c20..d615047 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml
@@ -108,7 +108,6 @@
resultMap="IvrLibaTargetResult">
<include refid="selectIvrLibaTargetVo"/>
WHERE 1=1
-
AND del_flag =0
<if test="id != null ">and id = #{id}</if>
<if test="groupid != null and groupid != ''">and groupid = #{groupid}</if>
@@ -134,8 +133,6 @@
<if test="suitWay != null and suitWay != ''">and suitWay like concat('%', #{suitWay}, '%')</if>
<if test="parameter != null and parameter != ''">and parameter = #{parameter}</if>
<if test="optionDesc != null and optionDesc != ''">and option_desc = #{optionDesc}</if>
-
-
order by update_time desc
</select>
@@ -172,7 +169,6 @@
LEFT JOIN ivr_liba_targetoption b
on a.id = b.targetid
WHERE 1=1
-
AND a.del_flag != 1 and b.del_flag != 1
<if test="groupid != null and groupid != ''">and a.groupid = #{groupid}</if>
<if test="targettype != null and targettype != ''">and a.targettype = #{targettype}</if>
@@ -196,8 +192,6 @@
<if test="suitWay != null and suitWay != ''">a.suitWay like concat('%', #{suitWay}, '%')</if>
<if test="parameter != null and parameter != ''">a.parameter = #{parameter}</if>
<if test="optionDesc != null and optionDesc != ''">a.option_desc = #{optionDesc}</if>
-
-
ORDER BY a.targetID
</select>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetTagMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetTagMapper.xml
index 9c9b5af..9f0901f 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetTagMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetTagMapper.xml
@@ -45,7 +45,6 @@
resultMap="IvrLibaTargetTagResult">
<include refid="selectIvrLibaTargetTagVo"/>
WHERE 1=1
-
AND del_flag=0
<if test="tagcategoryid != null ">and tagcategoryid = #{tagcategoryid}</if>
<if test="tagid != null ">and tagid = #{tagid}</if>
@@ -56,7 +55,6 @@
<if test="pid != null ">and pid = #{pid}</if>
<if test="tagname != null ">and tagname = #{tagname}</if>
<if test="guid != null and guid != ''">and guid = #{guid}</if>
-
</select>
<select id="selectIvrLibaTargetTagById" parameterType="Long" resultMap="IvrLibaTargetTagResult">
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetoptionMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetoptionMapper.xml
index 9588a8d..7219943 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetoptionMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetoptionMapper.xml
@@ -62,12 +62,11 @@
resultMap="IvrLibaTargetoptionResult">
<include refid="selectIvrLibaTargetoptionVo"/>
WHERE 1=1
-
AND del_flag != 1
<if test="targetid != null ">and targetid = #{targetid}</if>
<if test="targettype != null and targettype != ''">and targettype = #{targettype}</if>
- <if test="categoryName != null and categoryName != ''">and categoryName like concat('%', #{categoryName},
- AND '%')
+ <if test="categoryName != null and categoryName != ''">
+ and categoryName like concat('%', #{categoryName},'%')
</if>
<if test="targetvalue != null and targetvalue != ''">and targetvalue = #{targetvalue}</if>
<if test="targetregex != null and targetregex != ''">and targetregex = #{targetregex}</if>
@@ -91,7 +90,6 @@
<if test="appenddesc != null">and appenddesc = #{appenddesc}</if>
<if test="picturePath != null">and picture_path = #{picturePath}</if>
<if test="isEnd != null ">and is_end = #{isEnd}</if>
-
order by guid asc
</select>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateAssortMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateAssortMapper.xml
index f111ebb..d12c400 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateAssortMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateAssortMapper.xml
@@ -25,13 +25,14 @@
resultMap="IvrLibaTemplateAssortResult">
<include refid="selectIvrLibaTemplateAssortVo"/>
WHERE 1=1
-
+ <if test="orgid != null and orgid != ''">
+ and orgid = #{orgid}
+ </if>
AND del_flag=0
<if test="indexAssortName != null and indexAssortName != ''">and index_assort_name like concat('%',
#{indexAssortName}, '%')
</if>
<if test="pid != null ">and pid = #{pid}</if>
-
order by seqno asc
</select>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateMapper.xml
index de78d29..cc7cc7f 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateMapper.xml
@@ -72,10 +72,9 @@
resultMap="IvrLibaTemplateResult">
<include refid="selectIvrLibaTemplateVo"/>
WHERE 1=1
-
AND del_flag=0
- <if test="templateName != null and templateName != ''">and templateName like concat('%', #{templateName},
- AND '%')
+ <if test="templateName != null and templateName != ''">
+ and templateName like concat('%', #{templateName},'%')
</if>
<if test="id != null ">and id = #{id}</if>
<if test="sendDay != null ">and send_day = #{sendDay}</if>
@@ -113,7 +112,6 @@
<if test="noVoiceNum != null and noVoiceNum > 0">and no_voice_num = #{noVoiceNum}</if>
<if test="silencetime != null">and silencetime = #{silencetime}</if>
<if test="deptCode != null">and dept_code = #{deptCode}</if>
-
</select>
<select id="selectIvrLibaTemplateByID" parameterType="Long" resultMap="IvrLibaTemplateResult">
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml
index 5ccafde..eb5a626 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml
@@ -102,7 +102,6 @@
resultMap="IvrLibaTemplateScriptResult">
<include refid="selectIvrLibaTemplateScriptVo"/>
WHERE 1=1
-
AND del_flag=0
<if test="scriptno != null ">and scriptno = #{scriptno}</if>
<if test="assortid != null ">and assortid = #{assortid}</if>
@@ -126,12 +125,11 @@
<if test="branchNextscriptno != null and branchNextscriptno != ''">and branch_nextscriptno =
#{branchNextscriptno}
</if>
- <if test="categoryName != null and categoryName != ''">and categoryName like concat('%', #{categoryName},
- AND '%')
+ <if test="categoryName != null and categoryName != ''">
+ and categoryName like concat('%',#{categoryName},'%')
</if>
- <if test="scriptTopic != null and scriptTopic != ''">and script_topic like concat('%',
- #{scriptTopic},
- AND '%')
+ <if test="scriptTopic != null and scriptTopic != ''">
+ and script_topic like concat('%',#{scriptTopic},'%')
</if>
<if test="playWavOnly != null ">and playWavOnly = #{playWavOnly}</if>
<if test="valueType != null ">and value_type = #{valueType}</if>
@@ -146,7 +144,6 @@
<if test="scriptType != null">and script_type = #{scriptType}</if>
<if test="sort != null">and sort = #{sort}</if>
<if test="score != null">and score = #{score}</if>
-
</select>
<select id="selectIvrLibaTemplateScriptByID" parameterType="Long" resultMap="IvrLibaTemplateScriptResult">
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateTagMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateTagMapper.xml
index 5853bfd..71c95a5 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateTagMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateTagMapper.xml
@@ -47,7 +47,6 @@
resultMap="IvrLibaTemplateTagResult">
<include refid="selectIvrLibaTemplateTagVo"/>
WHERE 1=1
-
AND del_flag=0
<if test="tagcategoryid != null ">and tagcategoryid = #{tagcategoryid}</if>
<if test="templateid != null ">and templateid = #{templateid}</if>
@@ -58,7 +57,6 @@
<if test="targetid != null ">and targetid = #{targetid}</if>
<if test="pid != null ">and pid = #{pid}</if>
<if test="guid != null and guid != ''">and guid = #{guid}</if>
-
</select>
<select id="selectIvrLibaTemplateTagById" parameterType="Long" resultMap="IvrLibaTemplateTagResult">
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateTargetoptionMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateTargetoptionMapper.xml
index 4d3eab6..fa3468a 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateTargetoptionMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateTargetoptionMapper.xml
@@ -73,7 +73,6 @@
resultMap="IvrLibaTemplateTargetoptionResult">
<include refid="selectIvrLibaTemplateTargetoptionVo"/>
WHERE 1=1
-
AND del_flag=0
<if test="targetid != null ">and targetid = #{targetid}</if>
<if test="isEnd != null ">and is_end = #{isEnd}</if>
@@ -82,8 +81,8 @@
<if test="templateID != null ">and templateID = #{templateID}</if>
<if test="scriptid != null ">and scriptid = #{scriptid}</if>
<if test="targettype != null and targettype != ''">and targettype = #{targettype}</if>
- <if test="categoryName != null and categoryName != ''">and categoryName like concat('%', #{categoryName},
- AND '%')
+ <if test="categoryName != null and categoryName != ''">
+ and categoryName like concat('%', #{categoryName},'%')
</if>
<if test="targetvalue != null and targetvalue != ''">and targetvalue = #{targetvalue}</if>
<if test="targetregex != null and targetregex != ''">and targetregex = #{targetregex}</if>
@@ -105,7 +104,6 @@
<if test="optionNo != null">and option_no = #{optionNo}</if>
<if test="sendTaskid != null">and send_taskid= #{sendTaskid}</if>
<if test="sendTaskname != null">and send_taskname = #{sendTaskname}</if>
-
</select>
<select id="selectIvrLibaTemplateTargetoptionById" parameterType="Long"
diff --git a/smartor/src/main/resources/mapper/smartor/IvrSceneExecuteconfigMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrSceneExecuteconfigMapper.xml
index 7f293e0..777d304 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrSceneExecuteconfigMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrSceneExecuteconfigMapper.xml
@@ -34,7 +34,6 @@
<select id="selectIvrSceneExecuteconfigList" parameterType="IvrSceneExecuteconfig" resultMap="IvrSceneExecuteconfigResult">
<include refid="selectIvrSceneExecuteconfigVo"/>
WHERE 1=1
-
<if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="sourcetype != null "> and sourcetype = #{sourcetype}</if>
<if test="globalid != null "> and globalid = #{globalid}</if>
@@ -48,7 +47,6 @@
<if test="executeconditionscode != null and executeconditionscode != ''"> and executeconditionscode = #{executeconditionscode}</if>
<if test="executeresultcode != null and executeresultcode != ''"> and executeresultcode = #{executeresultcode}</if>
<if test="flownodeid != null "> and flownodeid = #{flownodeid}</if>
-
</select>
<select id="selectIvrSceneExecuteconfigByScenecfgid" parameterType="Long" resultMap="IvrSceneExecuteconfigResult">
diff --git a/smartor/src/main/resources/mapper/smartor/IvrSceneFlowMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrSceneFlowMapper.xml
index 182c422..93037f6 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrSceneFlowMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrSceneFlowMapper.xml
@@ -34,7 +34,6 @@
<select id="selectIvrSceneFlowList" parameterType="IvrSceneFlow" resultMap="IvrSceneFlowResult">
<include refid="selectIvrSceneFlowVo"/>
WHERE 1=1
-
<if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="isupload != null "> and isupload = #{isupload}</if>
<if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
@@ -48,7 +47,6 @@
<if test="sort != null "> and sort = #{sort}</if>
<if test="startnode != null "> and startnode = #{startnode}</if>
<if test="oldid != null "> and oldid = #{oldid}</if>
-
</select>
<select id="selectIvrSceneFlowByFlowid" parameterType="Long" resultMap="IvrSceneFlowResult">
diff --git a/smartor/src/main/resources/mapper/smartor/IvrSceneFlownodeMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrSceneFlownodeMapper.xml
index d65ddc2..dd1c53b 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrSceneFlownodeMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrSceneFlownodeMapper.xml
@@ -38,7 +38,6 @@
<select id="selectIvrSceneFlownodeList" parameterType="IvrSceneFlownode" resultMap="IvrSceneFlownodeResult">
<include refid="selectIvrSceneFlownodeVo"/>
WHERE 1=1
-
<if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="isupload != null "> and isupload = #{isupload}</if>
<if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
@@ -56,7 +55,6 @@
<if test="flowcode != null and flowcode != ''"> and flowcode = #{flowcode}</if>
<if test="targetid != null "> and targetid = #{targetid}</if>
<if test="oldid != null "> and oldid = #{oldid}</if>
-
</select>
<select id="selectIvrSceneFlownodeByFlownodeid" parameterType="Long" resultMap="IvrSceneFlownodeResult">
diff --git a/smartor/src/main/resources/mapper/smartor/IvrSceneFlownodebranchMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrSceneFlownodebranchMapper.xml
index c041642..2e3aee3 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrSceneFlownodebranchMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrSceneFlownodebranchMapper.xml
@@ -33,7 +33,6 @@
<select id="selectIvrSceneFlownodebranchList" parameterType="IvrSceneFlownodebranch" resultMap="IvrSceneFlownodebranchResult">
<include refid="selectIvrSceneFlownodebranchVo"/>
WHERE 1=1
-
<if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="isupload != null "> and isupload = #{isupload}</if>
<if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
@@ -46,7 +45,6 @@
<if test="nodetype != null "> and nodetype = #{nodetype}</if>
<if test="targetid != null "> and targetid = #{targetid}</if>
<if test="oldid != null "> and oldid = #{oldid}</if>
-
</select>
<select id="selectIvrSceneFlownodebranchByBranchid" parameterType="Long" resultMap="IvrSceneFlownodebranchResult">
diff --git a/smartor/src/main/resources/mapper/smartor/IvrSceneGlobalconfigMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrSceneGlobalconfigMapper.xml
index 3ea31ab..5d08a5a 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrSceneGlobalconfigMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrSceneGlobalconfigMapper.xml
@@ -32,7 +32,6 @@
<select id="selectIvrSceneGlobalconfigList" parameterType="IvrSceneGlobalconfig" resultMap="IvrSceneGlobalconfigResult">
<include refid="selectIvrSceneGlobalconfigVo"/>
WHERE 1=1
-
<if test="sceneid != null "> and sceneid = #{sceneid}</if>
<if test="configname != null and configname != ''"> and configname like concat('%', #{configname}, '%')</if>
<if test="description != null and description != ''"> and description = #{description}</if>
@@ -44,7 +43,6 @@
<if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="isupload != null "> and isupload = #{isupload}</if>
<if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
-
</select>
<select id="selectIvrSceneGlobalconfigByGblconfigid" parameterType="Long" resultMap="IvrSceneGlobalconfigResult">
diff --git a/smartor/src/main/resources/mapper/smartor/IvrSceneIntentMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrSceneIntentMapper.xml
index ad6a4e1..8e0f5ad 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrSceneIntentMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrSceneIntentMapper.xml
@@ -64,7 +64,6 @@
<select id="selectIvrSceneIntentList" parameterType="IvrSceneIntent" resultMap="IvrSceneIntentResult">
<include refid="selectIvrSceneIntentVo"/>
WHERE 1=1
-
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
<if test="sourcetype != null ">and sourcetype = #{sourcetype}</if>
<if test="gbiconfigid != null ">and gbiconfigid = #{gbiconfigid}</if>
@@ -80,14 +79,13 @@
<if test="conditionstype != null ">and conditionstype = #{conditionstype}</if>
<if test="verifyrule != null and verifyrule != ''">and verifyrule = #{verifyrule}</if>
<if test="orand != null ">and orand = #{orand}</if>
- <if test="parentresultconditionsid != null and parentresultconditionsid != ''">and parentresultconditionsid
- AND = #{parentresultconditionsid}
+ <if test="parentresultconditionsid != null and parentresultconditionsid != ''">
+ and parentresultconditionsid = #{parentresultconditionsid}
</if>
<if test="groupnumber != null ">and groupnumber = #{groupnumber}</if>
<if test="grouporand != null ">and grouporand = #{grouporand}</if>
<if test="isupload != null ">and isupload = #{isupload}</if>
<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
-
</select>
<select id="selectIvrSceneIntentBySceneintentid" parameterType="Long" resultMap="IvrSceneIntentResult">
diff --git a/smartor/src/main/resources/mapper/smartor/IvrSceneMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrSceneMapper.xml
index a77e680..5ee2093 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrSceneMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrSceneMapper.xml
@@ -37,6 +37,7 @@
<select id="selectIvrSceneList" parameterType="IvrScene" resultMap="IvrSceneResult">
<include refid="selectIvrSceneVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="categoryid != null and categoryid != ''"> and categoryid = #{categoryid}</if>
<if test="scenename != null and scenename != ''"> and scenename like concat('%', #{scenename}, '%')</if>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrSceneRecallMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrSceneRecallMapper.xml
index fcad437..ededc21 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrSceneRecallMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrSceneRecallMapper.xml
@@ -29,6 +29,7 @@
<select id="selectIvrSceneRecallList" parameterType="IvrSceneRecall" resultMap="IvrSceneRecallResult">
<include refid="selectIvrSceneRecallVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="sceneid != null "> and sceneid = #{sceneid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrSceneScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrSceneScriptMapper.xml
index b83d1c1..95063ec 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrSceneScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrSceneScriptMapper.xml
@@ -33,6 +33,7 @@
<select id="selectIvrSceneScriptList" parameterType="IvrSceneScript" resultMap="IvrSceneScriptResult">
<include refid="selectIvrSceneScriptVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="sourcetype != null "> and sourcetype = #{sourcetype}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrSceneScriptmodelMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrSceneScriptmodelMapper.xml
index 6953698..f83a894 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrSceneScriptmodelMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrSceneScriptmodelMapper.xml
@@ -36,6 +36,7 @@
<select id="selectIvrSceneScriptmodelList" parameterType="IvrSceneScriptmodel" resultMap="IvrSceneScriptmodelResult">
<include refid="selectIvrSceneScriptmodelVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="scenescrid != null "> and scenescrid = #{scenescrid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrScenecategoryMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrScenecategoryMapper.xml
index 8b612eb..0dc72d6 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrScenecategoryMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrScenecategoryMapper.xml
@@ -25,12 +25,10 @@
<select id="selectIvrScenecategoryList" parameterType="IvrScenecategory" resultMap="IvrScenecategoryResult">
<include refid="selectIvrScenecategoryVo"/>
WHERE 1=1
-
<if test="categoryname != null and categoryname != ''"> and categoryname like concat('%', #{categoryname}, '%')</if>
<if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="isupload != null "> and isupload = #{isupload}</if>
<if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
-
</select>
<select id="selectIvrScenecategoryByScenecatid" parameterType="Long" resultMap="IvrScenecategoryResult">
diff --git a/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateMapper.xml
index 84d1879..9b589ce 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateMapper.xml
@@ -92,6 +92,7 @@
resultMap="IvrTaskTemplateResult">
<include refid="selectIvrTaskTemplateVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag = 0
<if test="taskid != null ">and taskid = #{taskid}</if>
@@ -100,8 +101,8 @@
<if test="taskname != null and taskname != ''">and taskname like concat('%', #{taskname}, '%')</if>
<if test="targetid != null ">and targetid = #{targetid}</if>
<if test="targetname != null and targetname != ''">and targetname like concat('%', #{targetname}, '%')</if>
- <if test="templateName != null and templateName != ''">and templateName like concat('%', #{templateName},
- AND '%')
+ <if test="templateName != null and templateName != ''">
+ and templateName like concat('%', #{templateName},'%')
</if>
<if test="silencetime != null ">and silencetime = #{silencetime}</if>
<if test="recallcount != null ">and recallcount = #{recallcount}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml
index c69fd7d..69814f3 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml
@@ -83,6 +83,7 @@
resultMap="IvrTaskTemplateScriptResult">
<include refid="selectIvrTaskTemplateScriptVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="taskid != null ">and taskid = #{taskid}</if>
@@ -101,8 +102,8 @@
<if test="submoduleVoice != null and submoduleVoice != ''">and submoduleVoice = #{submoduleVoice}</if>
<if test="noClearlyText != null and noClearlyText != ''">and noClearlyText = #{noClearlyText}</if>
<if test="noClearlyVoice != null and noClearlyVoice != ''">and noClearlyVoice = #{noClearlyVoice}</if>
- <if test="categoryName != null and categoryName != ''">and categoryName like concat('%', #{categoryName},
- AND '%')
+ <if test="categoryName != null and categoryName != ''">
+ and categoryName like concat('%', #{categoryName},'%')
</if>
<if test="targetOptions != null and targetOptions != ''">and targetOptions = #{targetOptions}</if>
<if test="language != null and language != ''">and language = #{language}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateTargetoptionMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateTargetoptionMapper.xml
index 4a7df20..37cba08 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateTargetoptionMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateTargetoptionMapper.xml
@@ -72,6 +72,7 @@
resultMap="IvrTaskTemplateTargetoptionResult">
<include refid="selectIvrTaskTemplateTargetoptionVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="taskid != null ">and taskid = #{taskid}</if>
<if test="isEnd != null ">and is_end = #{isEnd}</if>
@@ -79,8 +80,8 @@
<if test="targetid != null ">and targetid = #{targetid}</if>
<if test="targetname != null and targetname != ''">and targetname like concat('%', #{targetname}, '%')</if>
<if test="targettype != null and targettype != ''">and targettype = #{targettype}</if>
- <if test="categoryName != null and categoryName != ''">and categoryName like concat('%', #{categoryName},
- AND '%')
+ <if test="categoryName != null and categoryName != ''">
+ and categoryName like concat('%', #{categoryName},'%')
</if>
<if test="targetvalue != null and targetvalue != ''">and targetvalue = #{targetvalue}</if>
<if test="targetregex2 != null and targetregex2 != ''">and targetregex2 = #{targetregex2}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrTaskVisitResultMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrTaskVisitResultMapper.xml
index 689b33f..dfade3e 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrTaskVisitResultMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrTaskVisitResultMapper.xml
@@ -61,6 +61,7 @@
resultMap="IvrTaskVisitResultResult">
<include refid="selectIvrTaskVisitResultVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="sendname != null and sendname != ''">and sendname like concat('%', #{sendname}, '%')</if>
<if test="phone != null and phone != ''">and phone = #{phone}</if>
@@ -70,8 +71,8 @@
<if test="type != null and type != ''">and type = #{type}</if>
<if test="taskid != null ">and taskid = #{taskid}</if>
<if test="templateid != null and templateid != ''">and templateid = #{templateid}</if>
- <if test="templatename != null and templatename != ''">and templatename like concat('%', #{templatename},
- AND '%')
+ <if test="templatename != null and templatename != ''">
+ and templatename like concat('%', #{templatename},'%')
</if>
<if test="senddate != null ">and senddate = #{senddate}</if>
<if test="userid != null and userid != ''">and userid = #{userid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrTaskcallrecordMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrTaskcallrecordMapper.xml
index 606e90d..53abfbc 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrTaskcallrecordMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrTaskcallrecordMapper.xml
@@ -85,6 +85,7 @@
resultMap="IvrTaskcallrecordResult">
<include refid="selectIvrTaskcallrecordVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="displayno != null and displayno != ''">and displayno = #{displayno}</if>
<if test="phone != null and phone != ''">and phone = #{phone}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrTasksmsMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrTasksmsMapper.xml
index 266b53d..f4d071e 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrTasksmsMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrTasksmsMapper.xml
@@ -52,6 +52,7 @@
<select id="selectIvrTasksmsList" parameterType="com.smartor.domain.IvrTasksms" resultMap="IvrTasksmsResult">
<include refid="selectIvrTasksmsVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="taskid != null ">and taskid = #{taskid}</if>
<if test="type != null ">and type = #{type}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/MedicalHistoryMapper.xml b/smartor/src/main/resources/mapper/smartor/MedicalHistoryMapper.xml
index 4207024..ea65212 100644
--- a/smartor/src/main/resources/mapper/smartor/MedicalHistoryMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/MedicalHistoryMapper.xml
@@ -29,6 +29,7 @@
<select id="selectMedicalHistoryList" parameterType="com.smartor.domain.MedicalHistory" resultMap="MedicalHistoryResult">
<include refid="selectMedicalHistoryVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="pastIllnesses != null and pastIllnesses != ''"> and past_illnesses = #{pastIllnesses}</if>
<if test="drugAllergy != null and drugAllergy != ''"> and drug_allergy = #{drugAllergy}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/MinioFileMapper.xml b/smartor/src/main/resources/mapper/smartor/MinioFileMapper.xml
index 4740285..4057590 100644
--- a/smartor/src/main/resources/mapper/smartor/MinioFileMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/MinioFileMapper.xml
@@ -42,12 +42,13 @@
<select id="selectMinioFileList" parameterType="com.smartor.domain.MinioFile" resultMap="MinioFileResult">
<include refid="selectMinioFileVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="originalFileName != null and originalFileName != ''">and original_file_name like concat('%',
#{originalFileName}, '%')
</if>
- <if test="fileExtName != null and fileExtName != ''">and file_ext_name like concat('%', #{fileExtName},
- AND '%')
+ <if test="fileExtName != null and fileExtName != ''">
+ and file_ext_name like concat('%', #{fileExtName},'%')
</if>
<if test="fileSize != null ">and file_size = #{fileSize}</if>
<if test="orgid != null ">and orgid = #{orgid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveImportMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveImportMapper.xml
index 29c046d..9d3f29e 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveImportMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveImportMapper.xml
@@ -55,6 +55,7 @@
resultMap="PatArchiveImportResult">
<include refid="selectPatArchiveImportVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="patientno != null and patientno != ''">
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index 4d78dc0..f27cb8a 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -181,6 +181,7 @@
<select id="selectPatArchiveList" parameterType="com.smartor.domain.PatArchive" resultMap="PatArchiveResult">
<include refid="selectPatArchiveVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
@@ -252,6 +253,7 @@
a.case_person_age
from pat_archive a,pat_archivetag b ,base_tag c
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND a.del_flag=0 and
AND a.id = b.patid and b.tagid = c.tagid
@@ -516,6 +518,7 @@
pat_archive a
LEFT JOIN pat_archivetag b ON a.id = b.patid AND b.del_flag = 0
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND a.del_flag = 0
and a.orgid = #{orgid}
@@ -600,6 +603,7 @@
) t ON t.patid =
d.patid
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND d.del_flag != 1
AND a.del_flag != 1
@@ -733,6 +737,7 @@
) t ON t.patid =
d.patid
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND d.del_flag != 1
AND a.del_flag != 1
@@ -828,6 +833,7 @@
) t ON t.patid =
d.patid
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND d.del_flag != 1
AND a.del_flag != 1
@@ -937,6 +943,7 @@
) t ON t.patid =
d.patid
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND d.del_flag != 1
AND a.del_flag != 1
@@ -1074,6 +1081,7 @@
) t ON t.patid =
d.patid
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND d.del_flag != 1
AND a.del_flag != 1
@@ -1171,6 +1179,7 @@
) t ON t.patid =
d.patid
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND d.del_flag != 1
AND a.del_flag != 1
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveOutMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveOutMapper.xml
index 705f198..beeb226 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveOutMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveOutMapper.xml
@@ -77,6 +77,7 @@
resultMap="PatArchiveOutResult">
<include refid="selectPatArchiveOutVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="patientno != null and patientno != ''">and patientno = #{patientno}</if>
<if test="pattype != null and pattype != ''">and pattype = #{pattype}</if>
@@ -118,6 +119,7 @@
from (
SELECT "浣忛櫌" as name1, count(1) as count FROM `pat_med_inhosp`
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag = 0 and endtime = null
<if test="deptIds != null ">and deptId in
@@ -134,6 +136,7 @@
union
select "鍑洪櫌" name1, count(1) as count FROM `pat_med_inhosp`
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0 and endtime != null
<if test="deptIds != null ">and deptId in
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchivecontactMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchivecontactMapper.xml
index dbc1a6c..b0c2887 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchivecontactMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchivecontactMapper.xml
@@ -49,6 +49,7 @@
resultMap="PatArchivecontactResult">
<include refid="selectPatArchivecontactVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="patid != null ">and patid = #{patid}</if>
@@ -59,8 +60,8 @@
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
<if test="isupload != null ">and isupload = #{isupload}</if>
<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
- <if test="contactname != null and contactname != ''">and contactname like concat('%', #{contactname},
- AND '%')
+ <if test="contactname != null and contactname != ''">
+ and contactname like concat('%', #{contactname},'%')
</if>
<if test="pid != null ">and pid = #{pid}</if>
<if test="guid != null and guid != ''">and guid = #{guid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchivetagMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchivetagMapper.xml
index 099904b..b375992 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchivetagMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchivetagMapper.xml
@@ -57,6 +57,7 @@
b.tagname
from pat_archivetag a ,base_tag b
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND a.tagid=b.tagid
<if test="tagcategoryid != null ">and a.tagcategoryid = #{tagcategoryid}</if>
@@ -134,6 +135,7 @@
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
</trim>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="tagid != null">and tagid = #{tagid}</if>
<if test="patid != null">and patid = #{patid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/PatFilterlistMapper.xml b/smartor/src/main/resources/mapper/smartor/PatFilterlistMapper.xml
index 2414842..1ef2290 100644
--- a/smartor/src/main/resources/mapper/smartor/PatFilterlistMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatFilterlistMapper.xml
@@ -34,6 +34,7 @@
<select id="selectPatFilterlistList" parameterType="com.smartor.domain.PatFilterlist" resultMap="PatFilterlistResult">
<include refid="selectPatFilterlistVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="patid != null "> and patid = #{patid}</if>
<if test="filtertype != null and filtertype != ''"> and filtertype = #{filtertype}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/PatHetaskRelevanceMapper.xml b/smartor/src/main/resources/mapper/smartor/PatHetaskRelevanceMapper.xml
index a59471e..dcc1d88 100644
--- a/smartor/src/main/resources/mapper/smartor/PatHetaskRelevanceMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatHetaskRelevanceMapper.xml
@@ -59,6 +59,7 @@
resultMap="PatTaskRelevanceResult">
<include refid="selectPatTaskRelevanceVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="patid != null ">and pat_id = #{patid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedBloodsugarMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedBloodsugarMapper.xml
index e0bf568..98b59b0 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedBloodsugarMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedBloodsugarMapper.xml
@@ -53,6 +53,7 @@
resultMap="PatMedBloodsugarResult">
<include refid="selectPatMedBloodsugarVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="serialnum != null and serialnum != ''">and serialnum = #{serialnum}</if>
<if test="recordtime != null ">and recordtime = #{recordtime}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedDrugMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedDrugMapper.xml
index fb31b90..519d815 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedDrugMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedDrugMapper.xml
@@ -62,6 +62,7 @@
<select id="selectPatMedDrugList" parameterType="com.smartor.domain.PatMedDrug" resultMap="PatMedDrugResult">
<include refid="selectPatMedDrugVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="serialnum != null and serialnum != ''">and serialnum = #{serialnum}</if>
<if test="patid != null ">and patid = #{patid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedHypertensionMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedHypertensionMapper.xml
index ade59f9..cef6a31 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedHypertensionMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedHypertensionMapper.xml
@@ -55,6 +55,7 @@
resultMap="PatMedHypertensionResult">
<include refid="selectPatMedHypertensionVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="serialnum != null and serialnum != ''">and serialnum = #{serialnum}</if>
<if test="recordtime != null ">and recordtime = #{recordtime}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index 3f8270b..74fd713 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -215,6 +215,7 @@
LEFT JOIN
pat_archivetag c ON c.patid = a.id AND (c.del_flag = 0 OR c.del_flag IS NULL)
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND a.del_flag = 0
AND b.del_flag = 0
@@ -231,12 +232,12 @@
<if test="endInHospTime != null ">and date_format(b.starttime,'%y%m%d') <=
AND date_format(#{endInHospTime},'%y%m%d')
</if>
- <if test="hospitalname != null and hospitalname != ''">and hospitalname like concat('%', #{hospitalname},
- AND '%')
+ <if test="hospitalname != null and hospitalname != ''">
+ and hospitalname like concat('%', #{hospitalname},'%')
</if>
<if test="patname != null and patname != ''">and patname like concat('%', #{patname}, '%')</if>
- <if test="hospitaldistrictname != null and hospitaldistrictname != ''">and hospitaldistrictname like
- AND concat('%', #{hospitaldistrictname}, '%')
+ <if test="hospitaldistrictname != null and hospitaldistrictname != ''">
+ and hospitaldistrictname like concat('%', #{hospitaldistrictname}, '%')
</if>
<if test="endtime != null ">and b.endtime = #{endtime}</if>
<if test="managementDoctor != null ">and b.management_doctor = #{managementDoctor}</if>
@@ -373,6 +374,7 @@
pat_med_inhosp b
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="serialnum != null ">and b.serialnum = #{serialnum}</if>
@@ -451,19 +453,20 @@
pat_med_inhosp b,
pat_archive a
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND a.del_flag=0
and b.del_flag=0
and a.id = b.patid
AND a.idcardno != ''
- <if test="hospitalname != null and hospitalname != ''">and hospitalname like concat('%', #{hospitalname},
- AND '%')
+ <if test="hospitalname != null and hospitalname != ''">
+ and hospitalname like concat('%', #{hospitalname},'%')
</if>
<if test="managementDoctor != null ">and b.management_doctor = #{managementDoctor}</if>
<if test="managementDoctorCode != null ">and b.management_doctor_code = #{managementDoctorCode}</if>
<if test="patname != null and patname != ''">and patname like concat('%', #{patname}, '%')</if>
- <if test="hospitaldistrictname != null and hospitaldistrictname != ''">and hospitaldistrictname like
- AND concat('%', #{hospitaldistrictname}, '%')
+ <if test="hospitaldistrictname != null and hospitaldistrictname != ''">
+ and hospitaldistrictname like concat('%', #{hospitaldistrictname}, '%')
</if>
<if test="endtime != null ">and b.endtime = #{endtime}</if>
<if test="serialnum != null ">and b.serialnum = #{serialnum}</if>
@@ -861,6 +864,7 @@
SELECT deptname
FROM pat_med_outhosp
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="deptcodeList != null and deptcodeList.size() > 0">
@@ -878,6 +882,7 @@
SELECT deptname
FROM pat_med_inhosp
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
and inhospstate=0
@@ -894,6 +899,7 @@
SELECT deptname
FROM pat_med_inhosp
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
and inhospstate=1
@@ -910,6 +916,7 @@
SELECT deptname
FROM pat_med_inhosp
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
and inhospstate=1
@@ -942,6 +949,7 @@
FROM
pat_med_inhosp
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="orgid != null">
@@ -981,6 +989,7 @@
FROM
service_subtask
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag = 0
and service_type=2
@@ -1011,6 +1020,7 @@
FROM
service_subtask
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag = 0
and service_type=2
@@ -1042,6 +1052,7 @@
FROM
service_subtask
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag = 0
and service_type=2
@@ -1073,6 +1084,7 @@
FROM
service_subtask
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag = 0
and service_type=13
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInspectionItemMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInspectionItemMapper.xml
index adee17d..1e1b55b 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInspectionItemMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInspectionItemMapper.xml
@@ -75,6 +75,7 @@
resultMap="PatMedInspectionItemResult">
<include refid="selectPatMedInspectionItemVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="inspectionid != null and inspectionid != ''">and inspectionid = #{inspectionid}</if>
<if test="inspectionName != null and inspectionName != ''">and inspection_name = #{inspectionName}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInspectionMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInspectionMapper.xml
index b006a1a..0663bf6 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInspectionMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInspectionMapper.xml
@@ -99,6 +99,7 @@
resultMap="PatMedInspectionResult">
<include refid="selectPatMedInspectionVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="projecttype != null">and projecttype = #{projecttype}</if>
<if test="inhospno != null">and inhospno = #{inhospno}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml
index 961aacf..ffa2589 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml
@@ -38,6 +38,7 @@
resultMap="PatMedOperationItemResult">
<include refid="selectPatMedOperationItemVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="operationid != null ">
and operationid = #{operationid}
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml
index 74e12f5..dc9f92b 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml
@@ -157,6 +157,7 @@
resultMap="PatMedOperationResult">
<include refid="selectPatMedOperationVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag='0'
<if test="patid != null ">
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
index 2034557..27aedda 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
@@ -122,6 +122,7 @@
pmo.mainsuit
from pat_med_outhosp pmo
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND pmo.del_flag=0
<if test="orgid != null ">and pmo.orgid = #{orgid}</if>
@@ -129,12 +130,11 @@
<if test="serverState != null ">and pmo.server_state = #{serverState}</if>
<if test="hospitalname != null and hospitalname != ''">and pmo.hospitalname like concat('%',
#{hospitalname},
- AND '%')
+ '%')
</if>
<if test="deptcodes != null and deptcodes.size()>0">
AND pmo.deptcode IN
- <foreach collection="deptcodes" item="deptcode" open="(" separator=","
- AND close=")">
+ <foreach collection="deptcodes" item="deptcode" open="(" separator="," close=")">
#{deptcode}
</foreach>
</if>
@@ -462,6 +462,7 @@
FROM
pat_med_outhosp
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="orgid != null">
@@ -483,6 +484,7 @@
FROM
service_subtask
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag = 0
and service_type=3
@@ -509,6 +511,7 @@
SELECT deptname, COUNT(1) AS rc
FROM pat_med_outhosp
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="inhospstate != null">
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOuthospProvisionalMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOuthospProvisionalMapper.xml
index c696836..d8e1876 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOuthospProvisionalMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOuthospProvisionalMapper.xml
@@ -54,6 +54,7 @@
resultMap="PatMedOuthospProvisionalResult">
<include refid="selectPatMedOuthospProvisionalVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="outhospno != null and outhospno != ''">
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedPhysicalMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedPhysicalMapper.xml
index 9df3e5a..3e392af 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedPhysicalMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedPhysicalMapper.xml
@@ -43,6 +43,7 @@
<select id="selectPatMedPhysicalList" parameterType="com.smartor.domain.PatMedPhysical" resultMap="PatMedPhysicalResult">
<include refid="selectPatMedPhysicalVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="hospitalname != null and hospitalname != ''"> and hospitalname like concat('%', #{hospitalname}, '%')</if>
<if test="physicaldate != null "> and physicaldate = #{physicaldate}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedRegistrationMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedRegistrationMapper.xml
index 3e6275a..427913c 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedRegistrationMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedRegistrationMapper.xml
@@ -63,11 +63,12 @@
resultMap="PatMedRegistrationResult">
<include refid="selectPatMedRegistrationVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="serialnum != null and serialnum != ''">and serialnum = #{serialnum}</if>
<if test="patid != null ">and patid = #{patid}</if>
- <if test="hospitalname != null and hospitalname != ''">and hospitalname like concat('%', #{hospitalname},
- AND '%')
+ <if test="hospitalname != null and hospitalname != ''">
+ and hospitalname like concat('%', #{hospitalname},'%')
</if>
<if test="hospitalcode != null and hospitalcode != ''">and hospitalcode = #{hospitalcode}</if>
<if test="deptcode != null and deptcode != ''">and deptcode = #{deptcode}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedWeightMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedWeightMapper.xml
index 8457aba..67e592c 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedWeightMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedWeightMapper.xml
@@ -32,6 +32,7 @@
<select id="selectPatMedWeightList" parameterType="com.smartor.domain.PatMedWeight" resultMap="PatMedWeightResult">
<include refid="selectPatMedWeightVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="serialnum != null and serialnum != ''"> and serialnum = #{serialnum}</if>
<if test="fatweight != null "> and fatweight = #{fatweight}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/PatSatisfactionMapper.xml b/smartor/src/main/resources/mapper/smartor/PatSatisfactionMapper.xml
index 9761ccd..7e9865a 100644
--- a/smartor/src/main/resources/mapper/smartor/PatSatisfactionMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatSatisfactionMapper.xml
@@ -59,6 +59,7 @@
resultMap="PatSatisfactionResult">
<include refid="selectPatSatisfactionVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="patName != null and patName != ''">
diff --git a/smartor/src/main/resources/mapper/smartor/PatSpeciallistCategoryMapper.xml b/smartor/src/main/resources/mapper/smartor/PatSpeciallistCategoryMapper.xml
index fa08823..9f994b8 100644
--- a/smartor/src/main/resources/mapper/smartor/PatSpeciallistCategoryMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatSpeciallistCategoryMapper.xml
@@ -37,6 +37,7 @@
resultMap="PatSpeciallistCategoryResult">
<include refid="selectPatSpeciallistCategoryVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
<if test="seqno != null ">and seqno = #{seqno}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/PatSpeciallistMapper.xml b/smartor/src/main/resources/mapper/smartor/PatSpeciallistMapper.xml
index 066e778..d9f3aa6 100644
--- a/smartor/src/main/resources/mapper/smartor/PatSpeciallistMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatSpeciallistMapper.xml
@@ -34,6 +34,7 @@
<select id="selectPatSpeciallistList" parameterType="com.smartor.domain.PatSpeciallist" resultMap="PatSpeciallistResult">
<include refid="selectPatSpeciallistVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="patid != null "> and patid = #{patid}</if>
<if test="sdtype != null and sdtype != ''"> and sdtype = #{sdtype}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/PatWildcardMapper.xml b/smartor/src/main/resources/mapper/smartor/PatWildcardMapper.xml
index eec1313..663b37e 100644
--- a/smartor/src/main/resources/mapper/smartor/PatWildcardMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatWildcardMapper.xml
@@ -34,6 +34,7 @@
<select id="selectPatWildcardList" parameterType="com.smartor.domain.PatWildcard" resultMap="PatWildcardResult">
<include refid="selectPatWildcardVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="wildcard != null and wildcard != ''">and wildcard = #{wildcard}</if>
<if test="patField != null and patField != ''">and pat_field = #{patField}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SchemeAutofinshruleMapper.xml b/smartor/src/main/resources/mapper/smartor/SchemeAutofinshruleMapper.xml
index 33d6114..843eacd 100644
--- a/smartor/src/main/resources/mapper/smartor/SchemeAutofinshruleMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SchemeAutofinshruleMapper.xml
@@ -41,6 +41,7 @@
resultMap="SchemeAutofinshruleResult">
<include refid="selectSchemeAutofinshruleVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="schemeid != null ">and schemeid = #{schemeid}</if>
<if test="ruletype != null ">and ruletype = #{ruletype}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SchemeCategoryMapper.xml b/smartor/src/main/resources/mapper/smartor/SchemeCategoryMapper.xml
index 19359ea..8e431f3 100644
--- a/smartor/src/main/resources/mapper/smartor/SchemeCategoryMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SchemeCategoryMapper.xml
@@ -26,6 +26,7 @@
<select id="selectSchemeCategoryList" parameterType="SchemeCategory" resultMap="SchemeCategoryResult">
<include refid="selectSchemeCategoryVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="categoryname != null and categoryname != ''"> and categoryname like concat('%', #{categoryname}, '%')</if>
<if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SchemeLocallibraryMapper.xml b/smartor/src/main/resources/mapper/smartor/SchemeLocallibraryMapper.xml
index 008622b..6b7c37e 100644
--- a/smartor/src/main/resources/mapper/smartor/SchemeLocallibraryMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SchemeLocallibraryMapper.xml
@@ -48,6 +48,7 @@
<select id="selectSchemeLocallibraryList" parameterType="SchemeLocallibrary" resultMap="SchemeLocallibraryResult">
<include refid="selectSchemeLocallibraryVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="schemecategoryid != null "> and schemecategoryid = #{schemecategoryid}</if>
<if test="schemename != null and schemename != ''"> and schemename like concat('%', #{schemename}, '%')</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SchemePlanMapper.xml b/smartor/src/main/resources/mapper/smartor/SchemePlanMapper.xml
index 202fdcd..84d632d 100644
--- a/smartor/src/main/resources/mapper/smartor/SchemePlanMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SchemePlanMapper.xml
@@ -38,6 +38,7 @@
<select id="selectSchemePlanList" parameterType="SchemePlan" resultMap="SchemePlanResult">
<include refid="selectSchemePlanVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="schemeid != null "> and schemeid = #{schemeid}</if>
<if test="schemecode != null and schemecode != ''"> and schemecode = #{schemecode}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SchemeTaskMapper.xml b/smartor/src/main/resources/mapper/smartor/SchemeTaskMapper.xml
index 4b8c729..731fc78 100644
--- a/smartor/src/main/resources/mapper/smartor/SchemeTaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SchemeTaskMapper.xml
@@ -62,6 +62,7 @@
<select id="selectSchemeTaskList" parameterType="SchemeTask" resultMap="SchemeTaskResult">
<include refid="selectSchemeTaskVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="schemeid != null "> and schemeid = #{schemeid}</if>
<if test="schemeplanid != null "> and schemeplanid = #{schemeplanid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SchemeTaskconfigMapper.xml b/smartor/src/main/resources/mapper/smartor/SchemeTaskconfigMapper.xml
index 8222c10..83e83b6 100644
--- a/smartor/src/main/resources/mapper/smartor/SchemeTaskconfigMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SchemeTaskconfigMapper.xml
@@ -64,6 +64,7 @@
<select id="selectSchemeTaskconfigList" parameterType="SchemeTaskconfig" resultMap="SchemeTaskconfigResult">
<include refid="selectSchemeTaskconfigVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="schemeid != null "> and schemeid = #{schemeid}</if>
<if test="triggersceneid != null "> and triggersceneid = #{triggersceneid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SchemeTaskrecordCalldetailMapper.xml b/smartor/src/main/resources/mapper/smartor/SchemeTaskrecordCalldetailMapper.xml
index 7194c03..35b9a83 100644
--- a/smartor/src/main/resources/mapper/smartor/SchemeTaskrecordCalldetailMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SchemeTaskrecordCalldetailMapper.xml
@@ -52,6 +52,7 @@
<select id="selectSchemeTaskrecordCalldetailList" parameterType="SchemeTaskrecordCalldetail" resultMap="SchemeTaskrecordCalldetailResult">
<include refid="selectSchemeTaskrecordCalldetailVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="uuid != null and uuid != ''"> and uuid = #{uuid}</if>
<if test="phone != null and phone != ''"> and phone = #{phone}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SchemeTaskrecordMapper.xml b/smartor/src/main/resources/mapper/smartor/SchemeTaskrecordMapper.xml
index c52d14c..8c74eff 100644
--- a/smartor/src/main/resources/mapper/smartor/SchemeTaskrecordMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SchemeTaskrecordMapper.xml
@@ -42,6 +42,7 @@
<select id="selectSchemeTaskrecordList" parameterType="SchemeTaskrecord" resultMap="SchemeTaskrecordResult">
<include refid="selectSchemeTaskrecordVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="recordtype != null "> and recordtype = #{recordtype}</if>
<if test="taskid != null "> and taskid = #{taskid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SchemeTaskrepeatconfigMapper.xml b/smartor/src/main/resources/mapper/smartor/SchemeTaskrepeatconfigMapper.xml
index 2ac3b69..d824b16 100644
--- a/smartor/src/main/resources/mapper/smartor/SchemeTaskrepeatconfigMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SchemeTaskrepeatconfigMapper.xml
@@ -37,6 +37,7 @@
<select id="selectSchemeTaskrepeatconfigList" parameterType="SchemeTaskrepeatconfig" resultMap="SchemeTaskrepeatconfigResult">
<include refid="selectSchemeTaskrepeatconfigVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="schemeid != null "> and schemeid = #{schemeid}</if>
<if test="triggersceneid != null "> and triggersceneid = #{triggersceneid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SchemeTriggerruleMapper.xml b/smartor/src/main/resources/mapper/smartor/SchemeTriggerruleMapper.xml
index ad58372..8509a09 100644
--- a/smartor/src/main/resources/mapper/smartor/SchemeTriggerruleMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SchemeTriggerruleMapper.xml
@@ -64,6 +64,7 @@
<select id="selectSchemeTriggerruleList" parameterType="SchemeTriggerrule" resultMap="SchemeTriggerruleResult">
<include refid="selectSchemeTriggerruleVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="conditionstype != null ">and conditionstype = #{conditionstype}</if>
<if test="orand != null ">and orand = #{orand}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SchemeTriggersceneMapper.xml b/smartor/src/main/resources/mapper/smartor/SchemeTriggersceneMapper.xml
index 7b7c916..7376819 100644
--- a/smartor/src/main/resources/mapper/smartor/SchemeTriggersceneMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SchemeTriggersceneMapper.xml
@@ -42,6 +42,7 @@
<select id="selectSchemeTriggersceneList" parameterType="SchemeTriggerscene" resultMap="SchemeTriggersceneResult">
<include refid="selectSchemeTriggersceneVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="schemeid != null ">and schemeid = #{schemeid}</if>
<if test="baselinetime != null ">and baselinetime = #{baselinetime}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceCheckMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceCheckMapper.xml
index 372d991..f6b2596 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceCheckMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceCheckMapper.xml
@@ -31,6 +31,7 @@
resultMap="ServiceCheckResult">
<include refid="selectServiceCheckVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="deptCode != null and deptCode != ''">
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceOutPathMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceOutPathMapper.xml
index 2061b52..1282c0e 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceOutPathMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceOutPathMapper.xml
@@ -37,6 +37,7 @@
resultMap="ServiceOutPathResult">
<include refid="selectServiceOutPathVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
and orgid is null
diff --git a/smartor/src/main/resources/mapper/smartor/ServicePatientTempMapper.xml b/smartor/src/main/resources/mapper/smartor/ServicePatientTempMapper.xml
index 7c09d6a..6f5db70 100644
--- a/smartor/src/main/resources/mapper/smartor/ServicePatientTempMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServicePatientTempMapper.xml
@@ -39,6 +39,7 @@
resultMap="ServicePatientTempResult">
<include refid="selectServicePatientTempVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="userId != null ">
and user_id = #{userId}
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskAnswerMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskAnswerMapper.xml
index e42762f..c062e19 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskAnswerMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskAnswerMapper.xml
@@ -53,6 +53,7 @@
resultMap="ServiceSubtaskAnswerResult">
<include refid="selectServiceSubtaskAnswerVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="taskid != null ">and taskid = #{taskid}</if>
<if test="patId != null ">and pat_id = #{patId}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml
index 6d1f984..64e9571 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml
@@ -121,6 +121,7 @@
resultMap="ServiceSubtaskDetailResult">
<include refid="selectServiceSubtaskDetailVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="subId != null">and sub_id = #{subId}</if>
<if test="targetid != null">and targetid = #{targetid}</if>
@@ -152,8 +153,8 @@
<if test="categoryid != null ">and categoryid = #{categoryid}</if>
<if test="questiontext != null and questiontext != ''">and questiontext = #{questiontext}</if>
<if test="questionvoice != null and questionvoice != ''">and questionvoice = #{questionvoice}</if>
- <if test="categoryname != null and categoryname != ''">and categoryname like concat('%', #{categoryname},
- AND '%')
+ <if test="categoryname != null and categoryname != ''">
+ and categoryname like concat('%', #{categoryname},'%')
</if>
<if test="targetoptions != null and targetoptions != ''">and targetoptions = #{targetoptions}</if>
<if test="targetvalue != null and targetvalue != ''">and targetvalue = #{targetvalue}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 9c943e6..0742f40 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -211,6 +211,7 @@
<include refid="selectServiceSubtaskVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="taskid != null ">and taskid = #{taskid}</if>
@@ -230,6 +231,7 @@
resultMap="ServiceSubtaskResult">
<include refid="selectServiceSubtaskVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="taskid != null ">and taskid = #{taskid}</if>
@@ -246,6 +248,7 @@
resultMap="ServiceSubtaskResult">
<include refid="selectServiceSubtaskVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="sendname != null and sendname != ''">and sendname like concat('%', #{sendname}, '%')</if>
@@ -279,8 +282,8 @@
<if test="type != null and type != ''">and type = #{type}</if>
<if test="taskid != null ">and taskid = #{taskid}</if>
<if test="templateid != null and templateid != ''">and templateid = #{templateid}</if>
- <if test="templatename != null and templatename != ''">and templatename like concat('%', #{templatename},
- AND '%')
+ <if test="templatename != null and templatename != ''">
+ and templatename like concat('%', #{templatename},'%')
</if>
<if test="startOutHospTime != null">
AND date_format(endtime,'%y%m%d') >= date_format(#{startOutHospTime},'%y%m%d')
@@ -415,6 +418,7 @@
resultMap="ServiceSubtaskResult">
<include refid="selectServiceSubtaskVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="visitTime != null">
@@ -430,6 +434,7 @@
resultMap="ServiceSubtaskResult">
<include refid="selectServiceSubtaskVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
and del_flag=0
<if test="createStartTime != null and createEndTime != null">
and create_time BETWEEN #{createStartTime} AND #{createEndTime}
@@ -454,6 +459,7 @@
resultMap="ServiceSubtaskResult">
<include refid="selectServiceSubtaskVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
and upid is not null
and visit_count > 1
@@ -510,6 +516,7 @@
from service_task a
JOIN service_subtask b on a.taskid = b.taskid and a.pat_cycle = 0 and b.del_flag = 0
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND b.taskid = #{taskid}
and b.patid = #{patid}
<if test="createTime != null and createTime != ''">
@@ -552,6 +559,7 @@
resultMap="ServiceSubtaskResult">
<include refid="selectServiceSubtaskVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND id in (
AND SELECT id FROM
@@ -960,6 +968,7 @@
<if test="isabnormal != null">isabnormal=#{isabnormal},</if>
</trim>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="patid != null ">and patid = #{patid}</if>
<if test="taskid != null ">and taskid = #{taskid}</if>
@@ -1169,6 +1178,7 @@
resultMap="ServiceSubtaskResult">
<include refid="selectServiceSubtaskVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
@@ -1210,6 +1220,7 @@
FROM service_subtask_detail a
WHERE sub_id IN(SELECT id FROM service_subtask t
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
@@ -1253,6 +1264,7 @@
SELECT targetname joyName,
(select COUNT(sub_id) FROM service_subtask_detail WHERE sub_id IN(SELECT id FROM service_subtask t
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
@@ -1284,6 +1296,7 @@
) AND targetid=a.id) joyCount , (SELECT COUNT(*) from (select sub_id FROM service_subtask_detail
WHERE sub_id IN(SELECT id FROM service_subtask t
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">AND
@@ -1331,6 +1344,7 @@
FROM service_subtask_detail a
INNER JOIN service_subtask t ON a.sub_id = t.id
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND a.del_flag=0
AND t.del_flag=0
@@ -1457,6 +1471,7 @@
service_subtask_detail ssd
INNER JOIN service_subtask ss ON ssd.sub_id = ss.id
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND ss.del_flag=0
AND IFNULL(ssd.matchedtext,ssd.asrtext) IS NOT NULL
@@ -1851,6 +1866,7 @@
SUM(CASE WHEN excep IS NOT NULL AND excep != '0' THEN 1 ELSE 0 END) AS yc
FROM service_subtask
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag = 0
<if test="sendname != null and sendname != ''">
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskPreachformMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskPreachformMapper.xml
index 84a2104..9f47e28 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskPreachformMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskPreachformMapper.xml
@@ -43,6 +43,7 @@
resultMap="ServiceSubtaskPreachformResult">
<include refid="selectServiceSubtaskPreachformVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="subid != null ">
and subid = #{subid}
@@ -229,6 +230,7 @@
</if>
</trim>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="subid != null">subid =
#{subid},
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskRecordMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskRecordMapper.xml
index 1b1720e..2c2d4a8 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskRecordMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskRecordMapper.xml
@@ -57,6 +57,7 @@
resultMap="ServiceSubtaskRecordResult">
<include refid="selectServiceSubtaskRecordVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="taskid != null and taskid != ''">and taskid = #{taskid}</if>
<if test="subtaskId != null ">and subtask_id = #{subtaskId}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
index c65d2c1..3baf21f 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
@@ -123,18 +123,19 @@
<select id="selectServiceTaskList" parameterType="com.smartor.domain.ServiceTask" resultMap="ServiceTaskResult">
<include refid="selectServiceTaskVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="taskName != null and taskName != ''">and task_name like concat('%', #{taskName}, '%')</if>
<if test="taskid != null">and taskid = #{taskid}</if>
- <if test="sendTimeSlot != null and sendTimeSlot != ''">and send_time_slot like concat('%', #{sendTimeSlot},
- AND '%')
+ <if test="sendTimeSlot != null and sendTimeSlot != ''">
+ and send_time_slot like concat('%', #{sendTimeSlot},'%')
</if>
<if test="templateid != null and templateid != ''">and templateid = #{templateid}</if>
<if test="longTask != null and longTask != ''">and long_task = #{longTask}</if>
<if test="serviceType != null and serviceType != ''">and service_type = #{serviceType}</if>
- <if test="templatename != null and templatename != ''">and templatename like concat('%', #{templatename},
- AND '%')
+ <if test="templatename != null and templatename != ''">
+ and templatename like concat('%', #{templatename},'%')
</if>
<if test="labelinfo != null and labelinfo != ''">and labelinfo = #{labelinfo}</if>
<if test="count != null ">and count = #{count}</if>
@@ -253,11 +254,13 @@
service_task.nexttaskname,
service_task.orgid from service_task
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND service_task.del_flag=0
<!-- and taskid in (-->
<!-- select task_id from service_taskdept-->
<!-- WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
-->
<!-- <if test="leaveldeptcodes != null and leaveldeptcodes.size()>0">-->
<!-- dept_code in-->
@@ -268,19 +271,17 @@
<!-- </if>-->
<!-- -->
<!-- )-->
- <if test="taskName != null and taskName != ''">and service_task.task_name like concat('%', #{taskName},
- AND '%')
+ <if test="taskName != null and taskName != ''">
+ and service_task.task_name like concat('%', #{taskName},'%')
</if>
- <if test="sendTimeSlot != null and sendTimeSlot != ''">and service_task.send_time_slot like concat('%',
- #{sendTimeSlot},
- AND '%')
+ <if test="sendTimeSlot != null and sendTimeSlot != ''">
+ and service_task.send_time_slot like concat('%',#{sendTimeSlot},'%')
</if>
<if test="templateid != null and templateid != ''">and service_task.templateid = #{templateid}</if>
<if test="longTask != null and longTask != ''">and service_task.long_task = #{longTask}</if>
<if test="serviceType != null and serviceType != ''">and service_task.service_type = #{serviceType}</if>
- <if test="templatename != null and templatename != ''">and service_task.templatename like concat('%',
- #{templatename},
- AND '%')
+ <if test="templatename != null and templatename != ''">
+ and service_task.templatename like concat('%',#{templatename},'%')
</if>
<if test="labelinfo != null and labelinfo != ''">and service_task.labelinfo = #{labelinfo}</if>
<if test="count != null ">and service_task.count = #{count}</if>
@@ -295,7 +296,7 @@
<if test="sendDay != null ">and service_task.send_day = #{sendDay}</if>
<if test="type != null and type != ''">and service_task.type = #{type}</if>
<if test="typename != null and typename != ''">and service_task.typename like concat('%', #{typename},
- AND '%')
+ '%')
</if>
<if test="beginTime != null ">and date_format( service_task.update_time,'%y%m%d') >=
AND date_format(#{beginTime},'%y%m%d')
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskdeptMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskdeptMapper.xml
index cf2dd24..966689c 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskdeptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskdeptMapper.xml
@@ -41,6 +41,7 @@
resultMap="ServiceTaskdeptResult">
<include refid="selectServiceTaskdeptVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="taskId != null ">
@@ -174,6 +175,7 @@
</if>
</trim>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="id != null">and id = #{id}</if>
<if test="taskId != null">and task_id = #{taskId}</if>
@@ -195,6 +197,7 @@
update_time = sysdate()
</trim>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="id != null">and id = #{id}</if>
<if test="taskId != null">and task_id = #{taskId}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskdiagMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskdiagMapper.xml
index 29d5c31..70e1670 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskdiagMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskdiagMapper.xml
@@ -45,6 +45,7 @@
resultMap="ServiceTaskdiagResult">
<include refid="selectServiceTaskdiagVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="taskId != null ">
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml
index 648eddc..08634e1 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml
@@ -45,6 +45,7 @@
resultMap="ServiceTaskoperResult">
<include refid="selectServiceTaskoperVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="taskId != null ">
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceThirdDataMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceThirdDataMapper.xml
index 8d1dabb..2286733 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceThirdDataMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceThirdDataMapper.xml
@@ -36,6 +36,7 @@
resultMap="ServiceThirdDataResult">
<include refid="selectServiceThirdDataVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="dataType != null and dataType != ''">and data_type = #{dataType}</if>
<if test="dataTypeExplain != null and dataTypeExplain != ''">and data_type_explain = #{dataTypeExplain}
diff --git a/smartor/src/main/resources/mapper/smartor/SvyCategoryMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyCategoryMapper.xml
index d08619c..7c4e0b5 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyCategoryMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyCategoryMapper.xml
@@ -38,9 +38,10 @@
<select id="selectSvyCategoryList" parameterType="com.smartor.domain.SvyCategory" resultMap="SvyCategoryResult">
<include refid="selectSvyCategoryVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
- <if test="categoryname != null and categoryname != ''">and categoryname like concat('%', #{categoryname},
- AND '%')
+ <if test="categoryname != null and categoryname != ''">
+ and categoryname like concat('%', #{categoryname},'%')
</if>
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
@@ -60,6 +61,7 @@
count(b.svyid) svyNum
from svy_category a,svy_lib_title b
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND a.id = b.categoryid
<if test="categoryname != null and categoryname != ''">
diff --git a/smartor/src/main/resources/mapper/smartor/SvyFinishMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyFinishMapper.xml
index c1c6897..d7fffe2 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyFinishMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyFinishMapper.xml
@@ -34,6 +34,7 @@
<select id="selectSvyFinishList" parameterType="SvyFinish" resultMap="SvyFinishResult">
<include refid="selectSvyFinishVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="svytitle != null and svytitle != ''"> and svytitle = #{svytitle}</if>
<if test="totalscore != null "> and totalscore = #{totalscore}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyFinishoptionMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyFinishoptionMapper.xml
index 973e174..994c278 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyFinishoptionMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyFinishoptionMapper.xml
@@ -30,6 +30,7 @@
<select id="selectSvyFinishoptionList" parameterType="SvyFinishoption" resultMap="SvyFinishoptionResult">
<include refid="selectSvyFinishoptionVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="psqoptionid != null "> and psqoptionid = #{psqoptionid}</if>
<if test="content != null and content != ''"> and content = #{content}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyFinishtopicMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyFinishtopicMapper.xml
index bff463c..ced291a 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyFinishtopicMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyFinishtopicMapper.xml
@@ -28,6 +28,7 @@
<select id="selectSvyFinishtopicList" parameterType="SvyFinishtopic" resultMap="SvyFinishtopicResult">
<include refid="selectSvyFinishtopicVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="topicid != null "> and topicid = #{topicid}</if>
<if test="score != null "> and score = #{score}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibExceptionMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibExceptionMapper.xml
index ed6bca2..175cb73 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibExceptionMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibExceptionMapper.xml
@@ -36,6 +36,7 @@
<select id="selectSvyLibExceptionList" parameterType="SvyLibException" resultMap="SvyLibExceptionResult">
<include refid="selectSvyLibExceptionVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="oldid != null "> and oldid = #{oldid}</if>
<if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibResultMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibResultMapper.xml
index 35af1d3..6bb80e3 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibResultMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibResultMapper.xml
@@ -29,6 +29,7 @@
<select id="selectSvyLibResultList" parameterType="SvyLibResult" resultMap="SvyLibResultResult">
<include refid="selectSvyLibResultVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="svyid != null "> and svyid = #{svyid}</if>
<if test="resultcontent != null and resultcontent != ''"> and resultcontent = #{resultcontent}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibScriptMapper.xml
index f03f4b7..de2684e 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibScriptMapper.xml
@@ -80,6 +80,7 @@
<select id="selectSvyLibScriptList" parameterType="com.smartor.domain.SvyLibScript" resultMap="SvyLibScriptResult">
<include refid="selectSvyLibScriptVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="id != null ">and id = #{id}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibScriptOptionMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibScriptOptionMapper.xml
index 224b51a..d049053 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibScriptOptionMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibScriptOptionMapper.xml
@@ -85,6 +85,7 @@
resultMap="SvyLibScriptOptionResult">
<include refid="selectSvyLibScriptOptionVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="topicid != null ">and topicid = #{topicid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibScriptTagMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibScriptTagMapper.xml
index e080728..d573109 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibScriptTagMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibScriptTagMapper.xml
@@ -45,6 +45,7 @@
resultMap="SvyLibScriptTagResult">
<include refid="selectSvyLibScriptTagVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag = 0
<if test="tagcategoryid != null ">and tagcategoryid = #{tagcategoryid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTemplageCategoryMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTemplageCategoryMapper.xml
index 995dc6f..cb67e78 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTemplageCategoryMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTemplageCategoryMapper.xml
@@ -37,6 +37,7 @@
resultMap="SvyLibTemplateCategoryResult">
<include refid="selectSvyLibTemplateCategoryVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml
index ffe4b4b..9f0b058 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml
@@ -124,6 +124,7 @@
icd10_association group by outid) b ON a.del_flag = 0
AND a.svyid = b.outid
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND a.del_flag=0
<if test="categoryid != null ">and a.categoryid = #{categoryid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml
index 7e107c5..45ecbfa 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptMapper.xml
@@ -93,6 +93,7 @@
resultMap="SvyLibTemplateScriptResult">
<include refid="selectSvyLibTemplateScriptVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="nextScriptno != null ">and next_scriptno = #{nextScriptno}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptWjxMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptWjxMapper.xml
index 638bc31..d73ce0f 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptWjxMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateScriptWjxMapper.xml
@@ -48,6 +48,7 @@
<select id="selectSvyLibTemplateScriptWjxList" parameterType="com.smartor.domain.SvyLibTemplateScriptWjx" resultMap="SvyLibTemplateScriptWjxResult">
<include refid="selectSvyLibTemplateScriptWjxVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="oldid != null "> and oldid = #{oldid}</if>
<if test="svyid != null "> and svyid = #{svyid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateTagMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateTagMapper.xml
index bc82d84..7286730 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateTagMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateTagMapper.xml
@@ -45,6 +45,7 @@
resultMap="SvyLibTemplateTagResult">
<include refid="selectSvyLibTemplateTagVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="tagcategoryid != null ">and tagcategoryid = #{tagcategoryid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateTargetoptionMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateTargetoptionMapper.xml
index 08d3f55..c82e250 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateTargetoptionMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateTargetoptionMapper.xml
@@ -78,11 +78,12 @@
resultMap="SvyLibTemplateTargetoptionResult">
<include refid="selectSvyLibTemplateTargetoptionVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="groupid != null and groupid != ''">and groupid = #{groupid}</if>
- <if test="categoryName != null and categoryName != ''">and categoryName like concat('%', #{categoryName},
- AND '%')
+ <if test="categoryName != null and categoryName != ''">
+ and categoryName like concat('%', #{categoryName},'%')
</if>
<if test="scriptid != null ">and scriptid = #{scriptid}</if>
<if test="prompt != null ">and prompt = #{prompt}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateTargetoptionWjxMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateTargetoptionWjxMapper.xml
index 5e2267b..e90e213 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateTargetoptionWjxMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateTargetoptionWjxMapper.xml
@@ -70,10 +70,11 @@
resultMap="SvyLibTemplateTargetoptionWjxResult">
<include refid="selectSvyLibTemplateTargetoptionWjxVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="groupid != null and groupid != ''">and groupid = #{groupid}</if>
- <if test="categoryName != null and categoryName != ''">and categoryName like concat('%', #{categoryName},
- AND '%')
+ <if test="categoryName != null and categoryName != ''">
+ and categoryName like concat('%', #{categoryName},'%')
</if>
<if test="scriptid != null ">and scriptid = #{scriptid}</if>
<if test="templateID != null ">and templateID = #{templateID}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateWjxMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateWjxMapper.xml
index d723f5c..16649ad 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateWjxMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateWjxMapper.xml
@@ -83,6 +83,7 @@
resultMap="SvyLibTemplateWjxResult">
<include refid="selectSvyLibTemplateWjxVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="templateid != null ">and templateid = #{templateid}</if>
<if test="categoryid != null ">and categoryid = #{categoryid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTopicCategoryMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTopicCategoryMapper.xml
index 615ca80..4b26991 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTopicCategoryMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTopicCategoryMapper.xml
@@ -39,6 +39,7 @@
resultMap="SvyLibScriptCategoryResult">
<include refid="selectSvyLibScriptCategoryVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTopicdirectionMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTopicdirectionMapper.xml
index d44bb7c..be87880 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTopicdirectionMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTopicdirectionMapper.xml
@@ -20,6 +20,7 @@
<select id="selectSvyLibTopicdirectionList" parameterType="com.smartor.domain.SvyLibTopicdirection" resultMap="SvyLibTopicdirectionResult">
<include refid="selectSvyLibTopicdirectionVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="topicid != null "> and topicid = #{topicid}</if>
<if test="transverse != null and transverse != ''"> and transverse = #{transverse}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyTaskAnswerMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyTaskAnswerMapper.xml
index d86bd38..8beef08 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyTaskAnswerMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyTaskAnswerMapper.xml
@@ -55,6 +55,7 @@
resultMap="SvyTaskAnswerResult">
<include refid="selectSvyTaskAnswerVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="taskid != null ">and taskid = #{taskid}</if>
<if test="singleid != null ">and singleid = #{singleid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyTaskMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyTaskMapper.xml
index 8589030..c10250a 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyTaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyTaskMapper.xml
@@ -108,12 +108,13 @@
<select id="selectSvyTaskList" parameterType="com.smartor.domain.SvyTask" resultMap="SvyTaskResult">
<include refid="selectSvyTaskVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="svrtaskid != null ">and svrtaskid = #{svrtaskid}</if>
<if test="taskName != null and taskName != ''">and task_name like concat('%', #{taskName}, '%')</if>
<if test="templateid != null and templateid != ''">and templateid = #{templateid}</if>
- <if test="templatename != null and templatename != ''">and templatename like concat('%', #{templatename},
- AND '%')
+ <if test="templatename != null and templatename != ''">
+ and templatename like concat('%', #{templatename},'%')
</if>
<if test="labelinfo != null and labelinfo != ''">and labelinfo = #{labelinfo}</if>
<if test="state != null ">and state = #{state}</if>
@@ -122,13 +123,13 @@
<if test="unexecuted != null ">and unexecuted = #{unexecuted}</if>
<if test="fail != null ">and fail = #{fail}</if>
<if test="patientid != null and patientid != ''">and patientid = #{patientid}</if>
- <if test="patientname != null and patientname != ''">and patientname like concat('%', #{patientname},
- AND '%')
+ <if test="patientname != null and patientname != ''">
+ and patientname like concat('%', #{patientname},'%')
</if>
<if test="addtime != null ">and addtime = #{addtime}</if>
<if test="checkuserid != null and checkuserid != ''">and checkuserid = #{checkuserid}</if>
- <if test="checkusername != null and checkusername != ''">and checkusername like concat('%',
- #{checkusername}, '%')
+ <if test="checkusername != null and checkusername != ''">
+ and checkusername like concat('%',#{checkusername}, '%')
</if>
<if test="checktime != null ">and checktime = #{checktime}</if>
<if test="type != null and type != ''">and type = #{type}</if>
@@ -146,8 +147,8 @@
<if test="sendType != null ">and send_type = #{sendType}</if>
<if test="sendState != null and sendState != ''">and send_state = #{sendState}</if>
<if test="param != null and param != ''">and param = #{param}</if>
- <if test="sendTimeSlot != null and sendTimeSlot != ''">and send_time_slot like concat('%', #{sendTimeSlot},
- AND '%')
+ <if test="sendTimeSlot != null and sendTimeSlot != ''">
+ and send_time_slot like concat('%', #{sendTimeSlot},'%')
</if>
<if test="libtemplateid != null ">and libtemplateid = #{libtemplateid}</if>
<if test="libtemplatename != null and libtemplatename != ''">and libtemplatename = #{libtemplatename}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyTaskScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyTaskScriptMapper.xml
index f2a1837..47a8330 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyTaskScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyTaskScriptMapper.xml
@@ -41,6 +41,7 @@
<select id="selectSvyTaskScriptList" parameterType="com.smartor.domain.SvyTaskScript" resultMap="SvyTaskScriptResult">
<include refid="selectSvyTaskScriptVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="scriptType != null "> and script_type = #{scriptType}</if>
<if test="scriptCode != null and scriptCode != ''"> and script_code = #{scriptCode}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyTaskScriptoptionMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyTaskScriptoptionMapper.xml
index 60eb399..b33e800 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyTaskScriptoptionMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyTaskScriptoptionMapper.xml
@@ -55,6 +55,7 @@
<select id="selectSvyTaskScriptoptionList" parameterType="com.smartor.domain.SvyTaskScriptoption" resultMap="SvyTaskScriptoptionResult">
<include refid="selectSvyTaskScriptoptionVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="taskScriptId != null "> and task_script_id = #{taskScriptId}</if>
<if test="svyid != null "> and svyid = #{svyid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyTaskSingleMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyTaskSingleMapper.xml
index e302a76..aff5b9d 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyTaskSingleMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyTaskSingleMapper.xml
@@ -145,6 +145,7 @@
resultMap="SvyTaskSingleResult">
<include refid="selectSvyTaskSingleVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="sendname != null and sendname != ''">and sendname like concat('%', #{sendname}, '%')</if>
<if test="phone != null and phone != ''">and phone = #{phone}</if>
@@ -156,8 +157,8 @@
<if test="type != null and type != ''">and type = #{type}</if>
<if test="taskid != null ">and taskid = #{taskid}</if>
<if test="templateid != null and templateid != ''">and templateid = #{templateid}</if>
- <if test="templatename != null and templatename != ''">and templatename like concat('%', #{templatename},
- AND '%')
+ <if test="templatename != null and templatename != ''">
+ and templatename like concat('%', #{templatename},'%')
</if>
<if test="senddate != null ">and senddate = #{senddate}</if>
<if test="sendlimitabegin != null and sendlimitabegin != ''">and sendlimitabegin = #{sendlimitabegin}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateMapper.xml
index f8cec26..d6ea32e 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateMapper.xml
@@ -93,6 +93,7 @@
resultMap="SvyTaskTemplateResult">
<include refid="selectSvyTaskTemplateVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="templateid != null ">and templateid = #{templateid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml
index 657a5f2..cc69597 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateScriptMapper.xml
@@ -73,6 +73,7 @@
resultMap="SvyTaskTemplateScriptResult">
<include refid="selectSvyTaskTemplateScriptVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="taskid != null ">and taskid = #{taskid}</if>
<if test="categoryid != null ">and categoryid = #{categoryid}</if>
@@ -82,8 +83,8 @@
<if test="scriptid != null ">and scriptid = #{scriptid}</if>
<if test="scriptDesc != null and scriptDesc != ''">and script_desc = #{scriptDesc}</if>
<if test="language != null and language != ''">and language = #{language}</if>
- <if test="categoryName != null and categoryName != ''">and categoryName like concat('%', #{categoryName},
- AND '%')
+ <if test="categoryName != null and categoryName != ''">
+ and categoryName like concat('%', #{categoryName},'%')
</if>
<if test="scriptContent != null and scriptContent != ''">and script_content = #{scriptContent}</if>
<if test="isMust != null and isMust != ''">and is_must = #{isMust}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateTargetoptionMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateTargetoptionMapper.xml
index f1c2555..eedecf0 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateTargetoptionMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyTaskTemplateTargetoptionMapper.xml
@@ -73,6 +73,7 @@
resultMap="SvyTaskTemplateTargetoptionResult">
<include refid="selectSvyTaskTemplateTargetoptionVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="taskid != null ">and taskid = #{taskid}</if>
@@ -82,8 +83,8 @@
<if test="targetid != null ">and targetid = #{targetid}</if>
<if test="targetname != null and targetname != ''">and targetname like concat('%', #{targetname}, '%')</if>
<if test="targettype != null and targettype != ''">and targettype = #{targettype}</if>
- <if test="categoryName != null and categoryName != ''">and categoryName like concat('%', #{categoryName},
- AND '%')
+ <if test="categoryName != null and categoryName != ''">
+ and categoryName like concat('%', #{categoryName},'%')
</if>
<if test="targetvalue != null and targetvalue != ''">and targetvalue = #{targetvalue}</if>
<if test="targetregex2 != null and targetregex2 != ''">and targetregex2 = #{targetregex2}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyTopicMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyTopicMapper.xml
index 5cd24e5..d5a0c3d 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyTopicMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyTopicMapper.xml
@@ -48,6 +48,7 @@
<select id="selectSvyTopicList" parameterType="com.smartor.domain.SvyTopic" resultMap="SvyTopicResult">
<include refid="selectSvyTopicVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="topictype != null ">and topictype = #{topictype}</if>
<if test="topiccode != null and topiccode != ''">and topiccode = #{topiccode}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyTopicoptionMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyTopicoptionMapper.xml
index 05ea2cd..560f897 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyTopicoptionMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyTopicoptionMapper.xml
@@ -79,6 +79,7 @@
resultMap="SvyTopicoptionResult">
<include refid="selectSvyTopicoptionVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="topicid != null ">and topicid = #{topicid}</if>
<if test="svyid != null ">and svyid = #{svyid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml b/smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml
index 48a330f..95d4558 100644
--- a/smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml
@@ -48,6 +48,7 @@
resultMap="SysUserDeptResult">
<include refid="selectSysUserDeptVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
and orgid=#{orgid}
diff --git a/smartor/src/main/resources/mapper/smartor/SysUserImportMapper.xml b/smartor/src/main/resources/mapper/smartor/SysUserImportMapper.xml
index c2cbf56..a0da4a2 100644
--- a/smartor/src/main/resources/mapper/smartor/SysUserImportMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SysUserImportMapper.xml
@@ -117,6 +117,7 @@
resultMap="SysUserImportResult">
<include refid="selectSysUserImportVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="subId != null ">
and sub_id = #{subId}
diff --git a/smartor/src/main/resources/mapper/smartor/SysUserRole2Mapper.xml b/smartor/src/main/resources/mapper/smartor/SysUserRole2Mapper.xml
index cf56145..27ace4f 100644
--- a/smartor/src/main/resources/mapper/smartor/SysUserRole2Mapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SysUserRole2Mapper.xml
@@ -27,6 +27,7 @@
select user_id,role_id,guid,orgid
from sys_user_role
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
<if test="roleId != null ">and role_id = #{roleId}</if>
<if test="userId != null ">and user_id = #{userId}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/TemplateDeptMapper.xml b/smartor/src/main/resources/mapper/smartor/TemplateDeptMapper.xml
index b8f41de..bccb037 100644
--- a/smartor/src/main/resources/mapper/smartor/TemplateDeptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/TemplateDeptMapper.xml
@@ -39,6 +39,7 @@
resultMap="TemplateDeptResult">
<include refid="selectTemplateDeptVo"/>
WHERE 1=1
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
AND del_flag=0
<if test="type != null ">
and type = #{type}
--
Gitblit v1.9.3