Merge branch 'dev' into dev(milestone2)

src/main/resources/mapper/knowledge/BannerMapper.xml

@@ -53,7 +53,7 @@
         FROM KM_BANNER kb JOIN LEARNING_USER_DEV.OS_USER users ON kb.UPDATE_BY_ = users.USER_ID_
         <where>
             <if test="@rx.Ognl@isNotEmpty(params.name)">
-                kb.NAME LIKE '%' || #{params.name} || '%'
+                and instr(kb.NAME,#{params.name}) > 0
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.type)">
                 and kb.TYPE = #{params.type}
@@ -62,7 +62,7 @@
                 and kb.ENABLED = #{params.enabled}
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.createBy)">
-                and users.FULLNAME_ LIKE '%' || #{params.createBy} || '%'
+                and instr(users.FULLNAME_,#{params.createBy}) > 0
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.beginTime)">
                 and TO_CHAR(kb.CREATE_TIME_,'yyyy-mm-dd') &gt;= #{params.beginTime}

src/main/resources/mapper/knowledge/KnowledgeApprovalNodeMapper.xml

@@ -56,7 +56,7 @@
     FROM KM_KNOWLEDGE_APPROVAL_NODE
     <where>
         <if test="@rx.Ognl@isNotEmpty(params.name)">
-            NAME LIKE '%' || #{params.name} || '%'
+            and instr(NAME,#{params.name}) > 0
         </if>
         and IS_DEL = 0
     </where>

src/main/resources/mapper/knowledge/KnowledgeApproveMapper.xml

@@ -58,7 +58,7 @@
         on ka.KNOWLEDGER_ID = k.PK_ID
         <where>
             <if test="@rx.Ognl@isNotEmpty(params.titles)">
-                k.TITLES LIKE '%' || #{params.titles} || '%'
+                and instr(k.TITLES,#{params.titles}) > 0
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.categoryId)">
                 and k.CATEGORY_ID IN (
@@ -69,7 +69,7 @@
                 and k.TYPE = #{params.type}
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.author)">
-                and k.AUTHOR LIKE '%' || #{params.author} || '%'
+                and instr(k.AUTHOR,#{params.author}) > 0
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.beginTime)">
                 and TO_CHAR(ka.CREATE_TIME_,'yyyy-mm-dd') &gt;= #{params.beginTime}

src/main/resources/mapper/knowledge/KnowledgeCategoryMapper.xml

@@ -45,7 +45,7 @@
     FROM KM_KNOWLEDGE_CATEGORY
     <where>
         <if test="@rx.Ognl@isNotEmpty(params.name)">
-            NAME LIKE '%' || #{params.name} || '%' and IS_DEL = 0
+            and instr(NAME,#{params.name}) > 0
         </if>
         <if test="@rx.Ognl@isEmpty(params.name)">
             and IS_DEL = 0 and PARENT = 0

src/main/resources/mapper/knowledge/KnowledgeLabelMapper.xml

@@ -48,7 +48,7 @@
         <where>
             IS_DEL = 0
             <if test="@rx.Ognl@isNotEmpty(params.name)">
-                AND name like '%'||#{params.name}||'%'
+                AND instr(name,#{params.name}) > 0
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.createTimeBegin)">
                 AND TO_CHAR(CREATE_TIME_,'yyyy-mm-dd') &gt;= #{params.createTimeBegin}

src/main/resources/mapper/knowledge/KnowledgeMapper.xml

@@ -60,12 +60,12 @@
         FROM KM_KNOWLEDGE
         <where>
             <if test="@rx.Ognl@isNotEmpty(params.keyword)">
-                (TITLES LIKE '%' || #{params.keyword} || '%' OR
-                TYPE LIKE '%' || #{params.keyword} || '%' OR
-                SUMMARY LIKE '%' || #{params.keyword} || '%')
+                (instr(TITLES,#{params.keyword}) > 0 OR
+                 instr(TYPE,#{params.keyword}) > 0 OR
+                 instr(SUMMARY,#{params.keyword}) > 0)
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.titles)">
-                and TITLES LIKE '%' || #{params.titles} || '%'
+                and instr(TITLES,#{params.titles}) > 0
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.categoryId)">
                 and CATEGORY_ID IN (
@@ -76,7 +76,7 @@
                 and TYPE = #{params.type}
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.author)">
-                and AUTHOR LIKE '%' || #{params.author} || '%'
+                and instr(AUTHOR,#{params.author}) > 0
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.beginTime)">
                 and TO_CHAR(CREATE_TIME_,'yyyy-mm-dd') &gt;= #{params.beginTime}
@@ -120,10 +120,10 @@
         FROM KM_KNOWLEDGE k JOIN KM_KNOWLEDGE_APPROVE ka ON k.PK_ID = ka.KNOWLEDGER_ID
         <where>
             <if test="@rx.Ognl@isNotEmpty(params.titles)">
-                k.TITLES LIKE '%' || #{params.titles} || '%'
+                instr(k.TITLES,#{params.titles}) > 0
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.categoryId)">
-                k.CATEGORY_ID IN (
+                and k.CATEGORY_ID IN (
                 SELECT c.PK_ID FROM KM_KNOWLEDGE_CATEGORY c WHERE c.IS_DEL = 0 START WITH c.PK_ID = #{params.categoryId} CONNECT BY PRIOR c.PK_ID = c.PARENT and c.IS_DEL = 0
                 )
             </if>
@@ -131,7 +131,7 @@
                 and k.TYPE = #{params.type}
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.author)">
-                and k.AUTHOR LIKE '%' || #{params.author} || '%'
+                and instr(k.AUTHOR,#{params.author}) > 0
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.beginTime)">
                 and TO_CHAR(ka.CREATE_TIME_,'yyyy-mm-dd') &gt;= #{params.beginTime}

src/main/resources/mapper/knowledge/NewsMapper.xml

@@ -52,13 +52,13 @@
         FROM KM_NEWS
         <where>
             <if test="@rx.Ognl@isNotEmpty(params.titles)">
-                TITLES LIKE '%' || #{params.titles} || '%'
+                and instr(TITLES,#{params.titles}) > 0
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.enabled)">
                 and ENABLED = #{params.enabled}
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.author)">
-                and AUTHOR LIKE '%' || #{params.author} || '%'
+                and instr(AUTHOR,#{params.author}) > 0
             </if>
             <if test="@rx.Ognl@isNotEmpty(params.beginTime)">
                 and TO_CHAR(CREATE_TIME_,'yyyy-mm-dd') &gt;= #{params.beginTime}
@@ -69,12 +69,6 @@
             and IS_DEL = 0
         </where>
         ORDER BY SORT ASC,ENABLED DESC
-<!--        <if test="@rx.Ognl@isNotEmpty(w.orderBySql)">-->
-<!--            ,${w.orderBySql}-->
-<!--        </if>-->
-<!--        <if test="@rx.Ognl@isEmpty(w.orderBySql)">-->
-<!--            ,CREATE_TIME_ DESC-->
-<!--        </if>-->
     </select>
 
     <select id="findAllPcNews" resultType="com.redxun.knowledge.entity.vo.NewsAdminVo">
@@ -83,9 +77,9 @@
         FROM KM_NEWS
         <where>
             <if test="@rx.Ognl@isNotEmpty(params.keyword)">
-                (TITLES LIKE '%' || #{params.keyword} || '%' OR
-                AUTHOR LIKE '%' || #{params.keyword} || '%' OR
-                CONTENT LIKE '%' || #{params.keyword} || '%')
+                (instr(TITLES,#{params.keyword}) > 0 OR
+                 instr(AUTHOR,#{params.keyword}) > 0 OR
+                 instr(CONTENT,#{params.keyword}) > 0)
             </if>
             and IS_DEL = 0 and ENABLED = 1
         </where>