Browse Source

Merge branch 'test' of git@git.coding.net:aft/AFT.git into test

wanghui 8 years ago
parent
commit
660f30b01c

+ 3 - 0
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -107,6 +107,9 @@
 		<if test="name != null and name != ''">
 			and a.identify_name like concat('%',#{name},'%')
 		</if>
+		<if test="expertAudit != null and expertAudit !=''">
+			and b.expert_audit = #{expertAudit,jdbcType=VARCHAR}
+		</if>
 		<if test="shareType != null">
 			and a.share_type = #{shareType,jdbcType=VARCHAR}
 		</if>

+ 1 - 1
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -51,7 +51,7 @@ import com.goafanti.customer.bo.UserDetailBo;
 import com.goafanti.customer.service.CustomerService;
 
 @RestController
-@RequestMapping("api/admin/customer")
+@RequestMapping("/api/admin/customer")
 public class AdminCustomerApiController extends BaseApiController{
 	@Resource
 	private CustomerService customerService;