Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -98,16 +98,11 @@ public class TaUserController extends BaseController {
     public ResponseBean taUserList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
-        String userName = getChannelUserName(request);
-        Integer channelId = null;
-        if (!"admin".equals(userName)){
-            channelId = getChannelId(request);
-        }
 
         try {
             //使用分页插件
 		    IPage pg = new Page<>(pageNum, pageSize);
-            IPage<Map<String,Object>> result = iTaUserService.getPageList(pg, channelId);
+            IPage<Map<String,Object>> result = iTaUserService.getPageList(pg, getChannelId(request));
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();