Browse Source

修改配置文件

wanghui 8 years ago
parent
commit
7ef6fe5a39

+ 7 - 6
src/main/java/com/goafanti/common/mapper/CustomerMapper.xml

@@ -418,7 +418,7 @@
     	and a.aid = #{aid,jdbcType=VARCHAR}
     </if>
     <if test="paid != null">
-    	or a.paid like concat('%',#{paid},'%')
+    	or a.paid like concat('%',#{paid,jdbcType=VARCHAR},'%')
     </if>
     <if test="shareType != null">
         and a.share_type = #{shareType,jdbcType=INTEGER}
@@ -442,14 +442,15 @@
     	 and c.tel_num = #{contactTel,jdbcType=VARCHAR}
     </if>
     <if test="companyName != null">
-    	and d.company_name = #{companyName,jdbcType=VARCHAR}
+    	and d.company_name like concat('%',#{companyName,jdbcType=VARCHAR},'%')
     </if>
     <if test="locationProvince != null">
     	and d.location_province = #{locationProvince,jdbcType=VARCHAR}
     </if>
    	<if test="adminName != null">
-   	 	and e.name = #{adminName,jdbcType=VARCHAR}
+   	 	and e.name like concat('%',#{adminName,jdbcType=VARCHAR},'%')
    	</if>
+   	order by a.create_time desc
    	<if test="page_sql!=null">
 		${page_sql}
 	</if>
@@ -467,7 +468,7 @@
     	and a.aid = #{aid,jdbcType=VARCHAR}
     </if>
     <if test="paid != null">
-    	or a.paid like concat('%',#{paid},'%')
+    	or a.paid like concat('%',#{paid,jdbcType=VARCHAR},'%')
     </if>
     <if test="shareType != null">
         and a.share_type = #{shareType,jdbcType=INTEGER}
@@ -491,13 +492,13 @@
     	 and c.tel_num = #{contactTel,jdbcType=VARCHAR}
     </if>
     <if test="companyName != null">
-    	and d.company_name = #{companyName,jdbcType=VARCHAR}
+    	and d.company_name like concat('%',#{companyName,jdbcType=VARCHAR},'%')
     </if>
     <if test="locationProvince != null">
     	and d.location_province = #{locationProvince,jdbcType=VARCHAR}
     </if>
    	<if test="adminName != null">
-   	 	and e.name = #{adminName,jdbcType=VARCHAR}
+   	 		and e.name like concat('%',#{adminName,jdbcType=VARCHAR},'%')
    	</if>
   </select>
   

+ 1 - 1
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -126,7 +126,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<CustomerMapper> implemen
 		Pagination<CustomerOut> list = (Pagination<CustomerOut>)findPage("selectCustomer","selectCustomerCount",params, pageNumber, pageSize);
 		Subject subject = SecurityUtils.getSubject();
 		list.setList(setResult((List<CustomerOut>)list.getList()));
-		if(!subject.isPermitted("customer_view_all")&&!subject.isPermitted(AFTConstants.SUPERADMIN)) {
+		if(!subject.isPermitted("customer_view_all")&&!subject.hasRole(AFTConstants.SUPERADMIN)) {
 			list.setList(descResult((List<CustomerOut>)list.getList()));
 		}
 		return list;

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -54,8 +54,8 @@ session.validate.timespan=18000000
 app.name=AFT
 template.cacheable=false
 
-static.host=//sb.jishutao.com/1.0.45
-portal.host=//sf.jishutao.com/portal/2.0.3
+static.host=//sb.jishutao.com/1.0.47
+portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.host=//sb.jishutao.com
 avatar.upload.host=//sb.jishutao.com/upload
 

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

@@ -54,8 +54,8 @@ session.validate.timespan=18000000
 app.name=AFT
 template.cacheable=false
 
-static.host=//static.jishutao.com/1.0.45
-portal.host=//static.jishutao.com/portal/2.0.3
+static.host=//static.jishutao.com/1.0.47
+portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload