Browse Source

Merge remote-tracking branch 'origin/test' into dev

anderx 6 years ago
parent
commit
fe1ecac79a

+ 2 - 7
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -342,15 +342,13 @@
 		left join district_glossory dg3 on b.location_area = dg3.id
 		left join admin d on a.aid = d.id 
 		where a.type = 1 and a.status != 1
+		and a.identify_name = #{name}
 		<if test="aid != null and aid !=''">
 			and a.aid = #{aid,jdbcType=VARCHAR}
 		</if>
 		<if test="departmentId != null and departmentId !=''">
 			and d.department_id=#{departmentId,jdbcType=VARCHAR}
 		</if>
-		<if test="name != null and name != ''">
-			and a.identify_name like concat('%',#{name},'%')
-		</if>
 		<if test="startDate != null and startDate != ''">
 			and a.transfer_time &gt; #{startDate}
 		</if>
@@ -381,13 +379,10 @@
 		where department_id=#{departmentId,jdbcType=VARCHAR}) d on a.aid = d.id
 		</if>
 		where a.type = 1 and a.status != 1
+		and a.identify_name = #{name}
 		<if test="aid != null and aid !=''">
 			and a.aid = #{aid,jdbcType=VARCHAR}
 		</if>
-		
-		<if test="name != null and name != ''">
-			and a.identify_name like concat('%',#{name},'%')
-		</if>
 		<if test="startDate != null and startDate != ''">
 			and a.transfer_time &gt; #{startDate}
 		</if>

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -54,7 +54,7 @@ session.validate.timespan=18000000
 app.name=AFT
 template.cacheable=false
 
-static.host=//static.jishutao.com/1.1.19
+static.host=//static.jishutao.com/1.1.21
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload