|
@@ -67,19 +67,19 @@ public class TaChannelController extends BaseController {
|
67
|
67
|
@RequestParam(value ="channelId",required = false) Integer channelId,
|
68
|
68
|
HttpServletRequest request){
|
69
|
69
|
ResponseBean responseBean = new ResponseBean();
|
70
|
|
- String orgid = JWTUtils.getSubject(request);
|
|
70
|
+ Integer orgId = getOrgId(request);
|
71
|
71
|
try {
|
72
|
72
|
//使用分页插件
|
73
|
73
|
IPage<TaChannel> pg = new Page<>(pageNum, pageSize);
|
74
|
74
|
QueryWrapper<TaChannel> queryWrapper = new QueryWrapper<>();
|
75
|
75
|
queryWrapper.eq(null != channelId, "channel_id", channelId);
|
|
76
|
+ queryWrapper.eq("org_id",orgId);
|
76
|
77
|
queryWrapper.orderByDesc("create_date");
|
77
|
|
-
|
78
|
78
|
IPage<TaChannel> result = taChannelService.page(pg, queryWrapper);
|
79
|
79
|
HashMap hashMap = new HashMap<>();
|
80
|
80
|
hashMap.put("result",result);
|
81
|
81
|
// 下拉列表的数据 all
|
82
|
|
- List<TaChannel> taChannelList = taChannelMapper.selectChannelList();
|
|
82
|
+ List<TaChannel> taChannelList = taChannelMapper.selectChannelList(orgId);
|
83
|
83
|
hashMap.put("channelNmae",taChannelList);
|
84
|
84
|
responseBean.addSuccess(hashMap);
|
85
|
85
|
}catch (Exception e){
|
|
@@ -96,12 +96,14 @@ public class TaChannelController extends BaseController {
|
96
|
96
|
* @return
|
97
|
97
|
*/
|
98
|
98
|
@RequestMapping(value="/admin/channel",method= RequestMethod.POST)
|
99
|
|
- public ResponseBean channelAdd(@RequestBody TaChannel channel){
|
|
99
|
+ public ResponseBean channelAdd(@RequestBody TaChannel channel ,HttpServletRequest request){
|
|
100
|
+ Integer orgId = getOrgId(request);
|
100
|
101
|
ResponseBean responseBean = new ResponseBean();
|
101
|
102
|
try {
|
102
|
103
|
// 生成6位数的渠道码
|
103
|
104
|
int channelCode= taChannelMapper.channelCode();
|
104
|
105
|
channel.setChannelCode(String.valueOf(channelCode));
|
|
106
|
+ channel.setOrgId(orgId);
|
105
|
107
|
if (taChannelService.save(channel)){
|
106
|
108
|
responseBean.addSuccess(channel);
|
107
|
109
|
}else {
|
|
@@ -186,8 +188,23 @@ public class TaChannelController extends BaseController {
|
186
|
188
|
public ResponseBean channelBrokerList(@RequestParam(value="name",required = false) String name,
|
187
|
189
|
@RequestParam(value="phone",required = false) String phone,
|
188
|
190
|
@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
|
189
|
|
- @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
|
190
|
|
- ResponseBean taPerson = taPersonService.channelBrokerList(name,phone,pageNum,pageSize);
|
|
191
|
+ @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
|
|
192
|
+ HttpServletRequest request){
|
|
193
|
+ Integer orgid = getOrgId(request);
|
|
194
|
+ ResponseBean taPerson = taPersonService.channelBrokerList(name,phone,pageNum,pageSize,orgid);
|
|
195
|
+ return taPerson;
|
|
196
|
+ }
|
|
197
|
+
|
|
198
|
+ /**
|
|
199
|
+ * 渠道邀请经纪人
|
|
200
|
+ */
|
|
201
|
+ @RequestMapping(value="/admin/channel/InviteClientsList",method= RequestMethod.GET)
|
|
202
|
+ public ResponseBean InviteClientsList(@RequestParam(value="id",required = false) String id,
|
|
203
|
+ @RequestParam(value="phone",required = false) String phone,
|
|
204
|
+ @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
|
|
205
|
+ @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
|
|
206
|
+ HttpServletRequest request){
|
|
207
|
+ ResponseBean taPerson = taPersonService.InviteClientsList(id,phone,pageNum,pageSize);
|
191
|
208
|
return taPerson;
|
192
|
209
|
}
|
193
|
210
|
}
|