|
@@ -1,5 +1,6 @@
|
|
|
package com.uas.platform.b2b.manage.controller;
|
|
package com.uas.platform.b2b.manage.controller;
|
|
|
|
|
|
|
|
|
|
+import com.uas.platform.b2b.manage.controller.support.PageResultBean;
|
|
|
import com.uas.platform.b2b.manage.core.support.SystemSession;
|
|
import com.uas.platform.b2b.manage.core.support.SystemSession;
|
|
|
import com.uas.platform.b2b.manage.model.AccessToken;
|
|
import com.uas.platform.b2b.manage.model.AccessToken;
|
|
|
import com.uas.platform.b2b.manage.model.EnterpriseBaseInfo;
|
|
import com.uas.platform.b2b.manage.model.EnterpriseBaseInfo;
|
|
@@ -55,7 +56,7 @@ public class EnterpriseCotroller {
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
@RequestMapping(value = "/list", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/list", method = RequestMethod.GET)
|
|
|
- public Page<EnterpriseBaseInfo> findByPageInfo(PageParams params, String keyword, HttpServletRequest request) {
|
|
|
|
|
|
|
+ public PageResultBean<EnterpriseBaseInfo> findByPageInfo(PageParams params, String keyword, HttpServletRequest request) {
|
|
|
PageInfo info = new PageInfo(params);
|
|
PageInfo info = new PageInfo(params);
|
|
|
Sort sort = new Sort(Sort.Direction.DESC, "enDate");
|
|
Sort sort = new Sort(Sort.Direction.DESC, "enDate");
|
|
|
info.setSort(sort);
|
|
info.setSort(sort);
|
|
@@ -63,7 +64,8 @@ public class EnterpriseCotroller {
|
|
|
keyword = keyword.trim();
|
|
keyword = keyword.trim();
|
|
|
}
|
|
}
|
|
|
useLogService.appendLog(UseType.ENGERPRISE_SEARCH.code(), keyword, AgentUtils.getIp(request));
|
|
useLogService.appendLog(UseType.ENGERPRISE_SEARCH.code(), keyword, AgentUtils.getIp(request));
|
|
|
- return baseInfoService.findEnterPageByKeyword(info, keyword);
|
|
|
|
|
|
|
+ PageResultBean resultBean = new PageResultBean(baseInfoService.findEnterPageByKeyword(info, keyword));
|
|
|
|
|
+ return resultBean;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|