Просмотр исходного кода

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

wanghui лет назад: 8
Родитель
Сommit
10e542a356

+ 1 - 1
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -240,7 +240,7 @@ public class WebpageController extends BaseController {
 		modelview.addObject("achievementList", achievementList);
 		modelview.addObject("demandList", demandList);
 		modelview.addObject("speciaList", speciaList);
-		return modelview;
+		return modelview; 
 	}
 
 	@RequestMapping(value = "/portal/technologyTrading/achievement", method = RequestMethod.GET)

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

@@ -30,7 +30,7 @@
 		left join district_glossory dg3 on b.area = dg3.id
 		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	
+		where a.type = 0  and a.status != 1 	
 		<if test="aid != null and aid !=''">
 			and a.aid = #{aid,jdbcType=VARCHAR}
 		</if>

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

@@ -89,6 +89,16 @@ public class AdminCustomerApiController extends BaseApiController{
 	@RequestMapping(value = "/listAllManagePersonalCustomer" , method = RequestMethod.POST)
 	public Result listAllManagePersonalCustomer(CustomerListIn cli,Integer pageNo, Integer pageSize){
 		Result res = new Result();
+		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)){
+			cli.setAid(TokenManager.getAdminId());
+		}
+		res.setData(customerService.listAllManagePersonalCustomer(cli, pageNo, pageSize));
+		return res;
+	}
+	/** 非管理的客户查询 **/
+	@RequestMapping(value = "/listPersonalCustomer" , method = RequestMethod.POST)
+	public Result listPersonalCustomer(CustomerListIn cli,Integer pageNo, Integer pageSize){
+		Result res = new Result();
 		res.setData(customerService.listAllManagePersonalCustomer(cli, pageNo, pageSize));
 		return res;
 	}