Bläddra i källkod

Merge branch 'test' of ssh://anderx@git.jishutao.com:55555/jishutao/kede-server.git into test

anderx 6 år sedan
förälder
incheckning
d431b932fb

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

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

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

@@ -153,8 +153,8 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 	@Override
 	public Pagination<CustomerListOut> listPrivateOrganizationCustomer(CustomerListIn cli,Integer sort,Integer sortType, Integer pageNo,Integer pageSize) {
 		cli.setType(AFTConstants.USER_TYPE_ORGANIZATION);
-//		cli.setAid(TokenManager.getAdminId());
-		cli.setAid("1");
+		cli.setAid(TokenManager.getAdminId());
+//		cli.setAid("1");
 		cli.setShareType(String.valueOf(AFTConstants.USER_SHARE_PRIVATE));
 		Map<String,Object> params = disposeParams(cli);
 		params.put("sort", sort);