Merge remote-tracking branch 'origin/master'

agent-manager/src/main/resources/bootstrap.yml

@@ -48,6 +48,5 @@ application:
   auth:
     unloginUrl: /refresh,/error,/login/login,/login/index,/login/logout,/securitycode/createCode,/file/common/*,/test*,/resource/list,/api/asset/*,/api/*,/uploads/*,/project/file/*,/file/*
     uncheckUrl: /refresh,/error,/login/login,/login/index,/login/logout,/securitycode/createCode,/file/common/*,/test*,/resource/list,/api/asset/*,/api/*,/uploads/*,/project/file/*,/file/*
-dm:
-  enable: false
+
 

agent-manager/src/main/resources/sqlmap/base/system/user.xml

@@ -1160,7 +1160,7 @@
             </if>
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
-                    a.${column.isKeyWord(item.columnName)} ${item.sortKind}
+                    a.${item.columnName} ${item.sortKind}
                 </foreach>
             </trim>
         </if>

agent-manager/src/main/resources/sqlmap/module/category/CategoryMapper.xml

@@ -494,10 +494,11 @@
                     </if>
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
-                     a.${column.isKeyWord(item.columnName)} ${item.sortKind}
+                     a.${item.colName} ${item.sortKind}
                 </foreach>
             </trim>
         </if>
+
         <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
             order by
                     <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">

agent-manager/src/main/resources/sqlmap/module/company/CompanyMapper.xml

@@ -949,10 +949,11 @@
                     </if>
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
-                     a.${column.isKeyWord(item.columnName)} ${item.sortKind}
+                     a.${item.colName} ${item.sortKind}
                 </foreach>
             </trim>
         </if>
+
         <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
             order by
                     <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">

agent-manager/src/main/resources/sqlmap/module/declare/DeclareFinImagesMapper.xml

@@ -452,10 +452,11 @@
                     </if>
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
-                     a.${column.isKeyWord(item.columnName)} ${item.sortKind}
+                     a.${item.colName} ${item.sortKind}
                 </foreach>
             </trim>
         </if>
+
         <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
             order by
                     <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">

agent-manager/src/main/resources/sqlmap/module/declare/DeclareImagesMapper.xml

@@ -452,10 +452,11 @@
                     </if>
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
-                     a.${column.isKeyWord(item.columnName)} ${item.sortKind}
+                     a.${item.colName} ${item.sortKind}
                 </foreach>
             </trim>
         </if>
+
         <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
             order by
                     <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">

agent-manager/src/main/resources/sqlmap/module/declare/DeclareMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "mybatis-3-mapper.dtd">
+"mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.declare.dao.ibatis.DeclareDaoImpl">
 
     <!-- 字段和属性映射 -->
@@ -1329,10 +1329,11 @@
                     </if>
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
-                    a.${column.isKeyWord(item.columnName)} ${item.sortKind}
+                     a.${item.colName} ${item.sortKind}
                 </foreach>
             </trim>
         </if>
+
         <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
             order by
                     <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">

agent-manager/src/main/resources/sqlmap/module/evaluation/EvaluationInfoMapper.xml

@@ -690,10 +690,11 @@
                     </if>
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
-                     a.${column.isKeyWord(item.columnName)} ${item.sortKind}
+                     a.${item.colName} ${item.sortKind}
                 </foreach>
             </trim>
         </if>
+
         <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
             order by
                     <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">

agent-manager/src/main/resources/sqlmap/module/matter/MatterSubMapper.xml

@@ -921,10 +921,11 @@
                     </if>
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
-                     a.${column.isKeyWord(item.columnName)} ${item.sortKind}
+                     a.${item.colName} ${item.sortKind}
                 </foreach>
             </trim>
         </if>
+
         <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
             order by
                     <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">

agent-manager/src/main/resources/sqlmap/module/park/ParkMapper.xml

@@ -536,10 +536,11 @@
                     </if>
             <trim suffixOverrides=","  suffix="">
                 <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
-                     a.${column.isKeyWord(item.columnName)} ${item.sortKind}
+                     a.${item.colName} ${item.sortKind}
                 </foreach>
             </trim>
         </if>
+
         <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
             order by
                     <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">