ソースを参照

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

wanghui 8 年 前
コミット
e04c070983

+ 1 - 1
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -1329,7 +1329,7 @@
   	where a.deleted_sign = 0 
   	and ap.publish_client=0
 	and ap.publish_page='W02'
-	and bi.domain_name like '%#{url,jdbcType=VARCHAR}%'
+	and bi.domain_name like "%"#{url,jdbcType=VARCHAR}"%"
   	<if test="dataCategory != null and dataCategory != ''">
   		and a.data_category = #{dataCategory,jdbcType=INTEGER}
   	</if>

+ 0 - 2
src/main/java/com/goafanti/common/mapper/AchievementPublishMapper.xml

@@ -372,8 +372,6 @@ left join achievement a on ap.achievement_id=a.id
 left join admin ad on ap.publisher=ad.id
 left join branch_information bi on ap.publish_platform=bi.id
 where 1=1
-	and ap.publish_client = '1'
-	and ap.publish_page = 'W01'
 	<if test="name != null">
   	and a.name like "%"#{name,jdbcType=VARCHAR}"%"
   	</if>

+ 1 - 0
src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml

@@ -1041,6 +1041,7 @@
 				group by  seller_id ) o on t.uid=o.seller_id
 	where expert=1
 	and u.status !=1
+	and t.expert_audit =2
 	<if test="industry != null">
         and t.industry = #{industry,jdbcType=VARCHAR}
     </if>

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

@@ -31,7 +31,6 @@
 		left join industry_category c on b.industry = c.id
 		left join admin d on a.aid = d.id 		
 		where a.type = 0  and a.status != 1 and a.audit_status = 1	
-		AND a.audit_status=1
 		<if test="aid != null and aid !=''">
 			and a.aid = #{aid,jdbcType=VARCHAR}
 		</if>
@@ -912,7 +911,6 @@
 		left join admin d on a.aid = d.id
 		LEFT JOIN department_management dm on dm.id = d.department_id 		
 		where a.type = 0  and a.status != 1 and a.audit_status = 1
-		AND a.audit_status=1
 		and a.share_type =0
 		<if test="aid != null and aid !=''">
 			and (a.aid = #{aid,jdbcType=VARCHAR} or d.department_id=(select department_id from admin where id=#{aid,jdbcType=VARCHAR}))

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

@@ -89,7 +89,6 @@ public class AdminCustomerApiController extends BaseApiController{
 	@RequestMapping(value = "/listAllManagePersonalCustomer" , method = RequestMethod.POST)
 	public Result listAllManagePersonalCustomer(CustomerListIn cli,Integer pageNo, Integer pageSize){
 		Result res = new Result();
-		cli.setAid(TokenManager.getAdminId());
 		res.setData(customerService.listAllManagePersonalCustomer(cli, pageNo, pageSize));
 		return res;
 	}