|
|
@@ -38,19 +38,23 @@
|
|
|
</select>
|
|
|
<sql id="kbSQL">
|
|
|
SELECT
|
|
|
- kkl.ID AS dataId,
|
|
|
- sm.ID AS menuId,
|
|
|
- sm.NAME AS menuName,
|
|
|
- sm.PID AS systemId,
|
|
|
- '07f7a17323be40bb96c292b80631a5a2' AS pagePartId,
|
|
|
- kkl.CREATEDATE AS createDate,
|
|
|
- '' AS systemName,
|
|
|
- CONCAT( "存放目录: ", kkl.REMARK, "-@-", "标题: ", kkl.TITLE, "-@-", "创建人: ", kkl.CREATEUSERNAME,"-@-","附件: ", kkl.ANNEX ) AS searchResult
|
|
|
+ kkl.ID AS dataId,
|
|
|
+ sm.ID AS menuId,
|
|
|
+ sm.NAME AS menuName,
|
|
|
+ sm.PID AS systemId,
|
|
|
+ '07f7a17323be40bb96c292b80631a5a2' AS pagePartId,
|
|
|
+ kkl.CREATEDATE AS createDate,
|
|
|
+ '' AS systemName,
|
|
|
+ CONCAT( "存放目录: ", ifnull(kkl.REMARK,""), "-@-",
|
|
|
+ "标题: ",ifnull(kkl.TITLE,""), "-@-",
|
|
|
+ "创建人: ", ifnull(kkl.CREATEUSERNAME,""),"-@-",
|
|
|
+ "附件: ", ifnull(kkl.ANNEX,"") ) AS
|
|
|
+ searchResult
|
|
|
FROM
|
|
|
- kb_knowledge_ledger kkl
|
|
|
- INNER JOIN sys_module sm ON sm.ID = 'b03686d4b8b54b96a6d310be8bd925a4'
|
|
|
+ kb_knowledge_ledger kkl
|
|
|
+ INNER JOIN sys_module sm ON sm.ID = 'b03686d4b8b54b96a6d310be8bd925a4'
|
|
|
WHERE
|
|
|
- kkl.DELETED = '0'
|
|
|
+ kkl.DELETED = '0'
|
|
|
<bind name="pattern" value="'%' + searchContent + '%'"/>
|
|
|
and kkl.TITLE like #{pattern}
|
|
|
</sql>
|
|
|
@@ -72,7 +76,7 @@
|
|
|
'' AS systemName,
|
|
|
<foreach collection="searchVo.columnInfoList" item="columnInfo" separator=', "-@-",' open="CONCAT("
|
|
|
close=")">
|
|
|
- #{columnInfo.columnDesc},": ",a.${columnInfo.columnName}
|
|
|
+ #{columnInfo.columnDesc},": ",ifnull(a.${columnInfo.columnName},"")
|
|
|
</foreach>
|
|
|
as searchResult
|
|
|
from (${searchVo.tableSql}) a
|
|
|
@@ -118,7 +122,7 @@
|
|
|
'' AS systemName,
|
|
|
<foreach collection="searchVo.columnInfoList" item="columnInfo" separator=', "-@-",' open="CONCAT("
|
|
|
close=")">
|
|
|
- #{columnInfo.columnDesc},": ",a.${columnInfo.columnName}
|
|
|
+ #{columnInfo.columnDesc},": ",ifnull(a.${columnInfo.columnName},"")
|
|
|
</foreach>
|
|
|
as searchResult
|
|
|
from (${searchVo.tableSql}) a
|
