Skip to content

S
smart_gov_platform
Commit 68a0603f authored by 赵啸非's avatar 赵啸非
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents cf1351d8 d74afa0e
Show whitespace changes
Inline Side-by-side
Showing with 30 additions and 19 deletions
base-manager/pom.xml
View file @ 68a0603f
......@@ -235,7 +235,12 @@
<groupId>com.mortals.framework</groupId>
<artifactId>mortals-framework-annotation</artifactId>
</dependency>
<!-- 达梦数据库驱动-->
<dependency>
<groupId>com.dameng</groupId>
<artifactId>DmJdbcDriver18</artifactId>
<version>8.1.1.193</version>
</dependency>
</dependencies>
......
base-manager/src/main/resources/sqlmap/module/area/AreaMapper.xml
View file @ 68a0603f
......@@ -66,7 +66,7 @@
a.shortName as shortName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('domain') or colPickMode == 1 and data.containsKey('domain')))">
a.domain as domain,
a.`domain` as `domain`,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))">
a.status as status,
......@@ -143,7 +143,7 @@
a.shortName=#{data.shortName},
</if>
<if test="(colPickMode==0 and data.containsKey('domain')) or (colPickMode==1 and !data.containsKey('domain'))">
a.domain=#{data.domain},
a.`domain`=#{data.domain},
</if>
<if test="(colPickMode==0 and data.containsKey('status')) or (colPickMode==1 and !data.containsKey('status'))">
a.status=#{data.status},
......@@ -602,14 +602,14 @@
<if test="conditionParamRef.containsKey('domain')">
<if test="conditionParamRef.domain != null and conditionParamRef.domain != ''">
${_conditionType_} a.domain like #{${_conditionParam_}.domain}
${_conditionType_} a.`domain` like #{${_conditionParam_}.domain}
</if>
<if test="conditionParamRef.domain == null">
${_conditionType_} a.domain is null
${_conditionType_} a.`domain` is null
</if>
</if>
<if test="conditionParamRef.containsKey('domainList')">
${_conditionType_} a.domain in
${_conditionType_} a.`domain` in
<foreach collection="conditionParamRef.domainList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
......@@ -760,7 +760,7 @@
,
</if>
<if test="orderCol.containsKey('domain')">
a.domain
a.`domain`
<if test='orderCol.domain != null and "DESC".equalsIgnoreCase(orderCol.domain)'>DESC</if>
,
</if>
......
base-manager/src/main/resources/sqlmap/module/base/BaseAreaMapper.xml
View file @ 68a0603f
......@@ -66,7 +66,7 @@
a.shortName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('domain') or colPickMode == 1 and data.containsKey('domain')))">
a.domain,
a.`domain`,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))">
a.status,
......@@ -143,7 +143,7 @@
a.shortName=#{data.shortName},
</if>
<if test="(colPickMode==0 and data.containsKey('domain')) or (colPickMode==1 and !data.containsKey('domain'))">
a.domain=#{data.domain},
a.`domain`=#{data.domain},
</if>
<if test="(colPickMode==0 and data.containsKey('status')) or (colPickMode==1 and !data.containsKey('status'))">
a.status=#{data.status},
......@@ -613,14 +613,14 @@
<if test="conditionParamRef.containsKey('domain')">
<if test="conditionParamRef.domain != null and conditionParamRef.domain != ''">
${_conditionType_} a.domain like #{${_conditionParam_}.domain}
${_conditionType_} a.`domain` like #{${_conditionParam_}.domain}
</if>
<if test="conditionParamRef.domain == null">
${_conditionType_} a.domain is null
${_conditionType_} a.`domain` is null
</if>
</if>
<if test="conditionParamRef.containsKey('domainList')">
${_conditionType_} a.domain in
${_conditionType_} a.`domain` in
<foreach collection="conditionParamRef.domainList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
......@@ -771,7 +771,7 @@
,
</if>
<if test="orderCol.containsKey('domain')">
a.domain
a.`domain`
<if test='orderCol.domain != null and "DESC".equalsIgnoreCase(orderCol.domain)'>DESC</if>
,
</if>
......
base-manager/src/main/resources/sqlmap/module/matters/MattersAreaMapper.xml
View file @ 68a0603f
......@@ -47,7 +47,7 @@
a.shortName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('domain') or colPickMode == 1 and data.containsKey('domain')))">
a.domain,
a.`domain`,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('iid') or colPickMode == 1 and data.containsKey('iid')))">
a.iid,
......@@ -109,7 +109,7 @@
a.shortName=#{data.shortName},
</if>
<if test="(colPickMode==0 and data.containsKey('domain')) or (colPickMode==1 and !data.containsKey('domain'))">
a.domain=#{data.domain},
a.`domain`=#{data.domain},
</if>
<if test="(colPickMode==0 and data.containsKey('iid')) or (colPickMode==1 and !data.containsKey('iid'))">
a.iid=#{data.iid},
......@@ -437,14 +437,14 @@
<if test="conditionParamRef.containsKey('domain')">
<if test="conditionParamRef.domain != null and conditionParamRef.domain != ''">
${_conditionType_} a.domain like #{${_conditionParam_}.domain}
${_conditionType_} a.`domain` like #{${_conditionParam_}.domain}
</if>
<if test="conditionParamRef.domain == null">
${_conditionType_} a.domain is null
${_conditionType_} a.`domain` is null
</if>
</if>
<if test="conditionParamRef.containsKey('domainList')">
${_conditionType_} a.domain in
${_conditionType_} a.`domain` in
<foreach collection="conditionParamRef.domainList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
......@@ -573,7 +573,7 @@
,
</if>
<if test="orderCol.containsKey('domain')">
a.domain
a.`domain`
<if test='orderCol.domain != null and "DESC".equalsIgnoreCase(orderCol.domain)'>DESC</if>
,
</if>
......
portal-manager/pom.xml
View file @ 68a0603f
......@@ -183,6 +183,12 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<!-- 达梦数据库驱动-->
<dependency>
<groupId>com.dameng</groupId>
<artifactId>DmJdbcDriver18</artifactId>
<version>8.1.1.193</version>
</dependency>
</dependencies>
<build>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment