|
|
|
@@ -18,6 +18,7 @@ import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.web.bind.annotation.GetMapping; |
|
|
|
import org.springframework.web.bind.annotation.ModelAttribute; |
|
|
|
import org.springframework.web.bind.annotation.RequestMapping; |
|
|
|
import org.springframework.web.bind.annotation.RestController; |
|
|
|
|
|
|
|
@@ -415,11 +416,12 @@ public class WxUserStructureController extends BaseController { |
|
|
|
@ApiImplicitParams({ |
|
|
|
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), |
|
|
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) |
|
|
|
public ResultData findUserByChannel(String channelName, Integer pageNum, Integer pageSize) { |
|
|
|
public ResultData findUserByChannel(@ModelAttribute WxCUser wxCUser, |
|
|
|
Integer pageNum, Integer pageSize) { |
|
|
|
List<String> sceneList = null; |
|
|
|
if (StringUtils.isNotBlank(channelName)) { |
|
|
|
if (StringUtils.isNotBlank(wxCUser.getChannelName())) { |
|
|
|
WxUserChannel c = new WxUserChannel(); |
|
|
|
c.setChannelName(channelName); |
|
|
|
c.setChannelName(wxCUser.getChannelName()); |
|
|
|
PageInfo<WxUserChannel> page = wxUserChannelService.listAsPage(c, 1, 100); |
|
|
|
if (page.getSize() > 0) { |
|
|
|
sceneList = new ArrayList<>(); |
|
|
|
@@ -428,7 +430,8 @@ public class WxUserStructureController extends BaseController { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
PageInfo<WxCUser> page = wxCUserService.listByChannel(getTenantId(), sceneList, pageNum, pageSize); |
|
|
|
wxCUser.setSceneList(sceneList); |
|
|
|
PageInfo<WxCUser> page = wxCUserService.listByChannel(wxCUser, pageNum, pageSize); |
|
|
|
for (WxCUser u : page.getList()) { |
|
|
|
WxUserChannel c = new WxUserChannel(); |
|
|
|
c.setSceneAddress(u.getSceneAddress()); |
|
|
|
|