Merge branch 'develop' into dev/ruleNew20210727

src/main/resources/mapper/KlConceptMapper.xml

@@ -546,11 +546,11 @@
 			) t
 			LEFT JOIN kl_disease l1 ON t.id = l1.concept_id
 			AND l1.is_deleted = 'N'
-			WHERE
-			1=1
+			<where>
 			<if test="inputStr!=null and inputStr!=''">
 				AND  LOWER(l1.icd10_code) = LOWER(#{inputStr})
 			</if>
+			</where>
 			UNION
 			SELECT
 			t.moduleNo,
@@ -587,11 +587,11 @@
 			) t
 			LEFT JOIN kl_disease l1 ON t.id = l1.concept_id
 			AND l1.is_deleted = 'N'
-			WHERE
-			1=1
+			<where>
 			<if test="inputStr!=null and inputStr!=''">
 				AND LOWER(l1.icd10_code) LIKE LOWER( concat(#{inputStr},'%'))
 			</if>
+			</where>
 			UNION
 			SELECT
 			t.moduleNo,
@@ -628,11 +628,11 @@
 			) t
 			LEFT JOIN kl_disease l1 ON t.id = l1.concept_id
 			AND l1.is_deleted = 'N'
-			WHERE
-			1=1
+			<where>
 			<if test="inputStr!=null and inputStr!=''">
 				AND LOWER(l1.icd10_code) LIKE LOWER( concat('%',#{inputStr},'%'))
 			</if>
+			</where>
 		</if>)o1
 		order  by o1.type asc,o1.moduleNo ASC,o1.isConcept DESC
 		Limit 1000

src/main/resources/mapper/KlConceptStaticMapper.xml

@@ -349,11 +349,11 @@
             ) t
             LEFT JOIN kl_disease l1 ON t.id = l1.concept_id
             AND l1.is_deleted = 'N'
-            WHERE
-            1=1
+            <where>
             <if test="staticKnowledgeIndexPageVO.inputStr!=null and staticKnowledgeIndexPageVO.inputStr!=''">
                 AND LOWER(l1.icd10_code) = LOWER(#{staticKnowledgeIndexPageVO.inputStr})
             </if>
+            </where>
             UNION
             SELECT
             t.moduleNo,
@@ -390,11 +390,11 @@
             ) t
             LEFT JOIN kl_disease l1 ON t.id = l1.concept_id
             AND l1.is_deleted = 'N'
-            WHERE
-            1=1
+            <where>
             <if test="staticKnowledgeIndexPageVO.inputStr!=null and staticKnowledgeIndexPageVO.inputStr!=''">
                 AND LOWER(l1.icd10_code) LIKE LOWER( concat(#{staticKnowledgeIndexPageVO.inputStr},'%'))
             </if>
+            </where>
             UNION
             SELECT
             t.moduleNo,
@@ -431,11 +431,11 @@
             ) t
             LEFT JOIN kl_disease l1 ON t.id = l1.concept_id
             AND l1.is_deleted = 'N'
-            WHERE
-            1=1
+            <where>
             <if test="staticKnowledgeIndexPageVO.inputStr!=null and staticKnowledgeIndexPageVO.inputStr!=''">
                 AND LOWER(l1.icd10_code) LIKE LOWER( concat('%',#{staticKnowledgeIndexPageVO.inputStr},'%'))
             </if>
+            </where>
         </if>
         ) s,
         kl_concept_static s1