Sfoglia il codice sorgente

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

# Conflicts:
#	src/main/java/com/huiju/estateagents/common/CommConstant.java
傅行帆 5 anni fa
parent
commit
2b6df1b427
27 ha cambiato i file con 666 aggiunte e 40 eliminazioni
  1. 20
    0
      src/main/java/com/huiju/estateagents/base/BaseController.java
  2. 74
    22
      src/main/java/com/huiju/estateagents/center/sysUser/controller/SysUserController.java
  3. 34
    4
      src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java
  4. 12
    0
      src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java
  5. 1
    1
      src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserMapper.java
  6. 2
    2
      src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserService.java
  7. 6
    4
      src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java
  8. 231
    0
      src/main/java/com/huiju/estateagents/channel/sysChannel/controller/SysUserChannelController.java
  9. 36
    0
      src/main/java/com/huiju/estateagents/channel/sysChannel/entity/TaChannelProxy.java
  10. 12
    0
      src/main/java/com/huiju/estateagents/channel/sysChannel/mapper/TaChannelProxyMapper.java
  11. 10
    0
      src/main/java/com/huiju/estateagents/channel/sysChannel/service/ITaChannelProxyService.java
  12. 38
    0
      src/main/java/com/huiju/estateagents/channel/sysChannel/service/impl/TaChannelProxyServiceImpl.java
  13. 10
    0
      src/main/java/com/huiju/estateagents/common/CommConstant.java
  14. 2
    2
      src/main/java/com/huiju/estateagents/controller/TaMiniappController.java
  15. 15
    0
      src/main/java/com/huiju/estateagents/entity/TaBuilding.java
  16. 49
    0
      src/main/java/com/huiju/estateagents/entity/TaChannelAppRelation.java
  17. 1
    0
      src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java
  18. 18
    0
      src/main/java/com/huiju/estateagents/mapper/TaChannelAppRelationMapper.java
  19. 16
    0
      src/main/java/com/huiju/estateagents/service/ITaChannelAppRelationService.java
  20. 1
    1
      src/main/java/com/huiju/estateagents/service/ITaMiniappService.java
  21. 4
    1
      src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java
  22. 20
    0
      src/main/java/com/huiju/estateagents/service/impl/TaChannelAppRelationServiceImpl.java
  23. 33
    1
      src/main/java/com/huiju/estateagents/service/impl/TaMiniappServiceImpl.java
  24. 5
    0
      src/main/resources/mapper/TaChannelAppRelationMapper.xml
  25. 8
    0
      src/main/resources/mapper/TaChannelProxyMapper.xml
  26. 1
    1
      src/main/resources/mapper/TaRecommendCustomerMapper.xml
  27. 7
    1
      src/main/resources/mapper/TaUserMapper.xml

+ 20
- 0
src/main/java/com/huiju/estateagents/base/BaseController.java Vedi File

@@ -39,6 +39,26 @@ public class BaseController {
39 39
 		return null;
40 40
 	}
41 41
 
42
+	public Integer getChannelId(HttpServletRequest request){
43
+
44
+		Map map = JWTUtils.getUserIdAndOrgId(request);
45
+		if (null != map && null != map.get("channelId")){
46
+			return Integer.valueOf(map.get("channelId").toString());
47
+		}
48
+
49
+		return null;
50
+	}
51
+
52
+	public String getChannelUserName(HttpServletRequest request){
53
+
54
+		Map map = JWTUtils.getUserIdAndOrgId(request);
55
+		if (null != map && null != map.get("userName")){
56
+			return map.get("userName").toString();
57
+		}
58
+
59
+		return null;
60
+	}
61
+
42 62
 	public String getOpenId(HttpServletRequest request){
43 63
 
44 64
 		Map map = JWTUtils.getUserIdAndOrgId(request);

+ 74
- 22
src/main/java/com/huiju/estateagents/center/sysUser/controller/SysUserController.java Vedi File

@@ -10,6 +10,10 @@ import com.huiju.estateagents.center.sysUser.entity.SysToken;
10 10
 import com.huiju.estateagents.center.sysUser.entity.SysUser;
11 11
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
12 12
 import com.huiju.estateagents.center.sysUser.service.ISysUserService;
13
+import com.huiju.estateagents.center.taUser.entity.TaUser;
14
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
15
+import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
16
+import com.huiju.estateagents.channel.sysChannel.service.ITaChannelProxyService;
13 17
 import com.huiju.estateagents.common.CommConstant;
14 18
 import com.huiju.estateagents.common.JWTUtils;
15 19
 import com.huiju.estateagents.common.MD5Utils;
@@ -44,6 +48,12 @@ public class SysUserController extends BaseController {
44 48
     @Autowired
45 49
     private ISysTokenService sysTokenService;
46 50
 
51
+    @Autowired
52
+    private ITaUserService iTaUserService;
53
+
54
+    @Autowired
55
+    private ITaChannelProxyService iTaChannelProxyService;
56
+
47 57
     /**
48 58
      * 分页查询列表
49 59
      * @param pageNum
@@ -162,13 +172,14 @@ public class SysUserController extends BaseController {
162 172
      */
163 173
     @RequestMapping(value="/center/current",method=RequestMethod.GET)
164 174
     public ResponseBean currentUser(HttpServletRequest request){
165
-        String userName = JWTUtils.getSubject(request);
166
-        QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
167
-        sysUserQueryWrapper.eq("user_name",userName);
168
-        SysUser sysUser = iSysUserService.getOne(sysUserQueryWrapper);
169
-        sysUser.setPassword(null);
170
-
171
-        return ResponseBean.success(sysUser);
175
+        Map map = JWTUtils.getUserIdAndOrgId(request);
176
+        QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
177
+        taChannelProxyQueryWrapper.eq("user_name", map.get("userName")).or().eq("channel_tel", map.get("userName"));
178
+        TaChannelProxy taChannelProxy = iTaChannelProxyService.getOne(taChannelProxyQueryWrapper);
179
+        if (StringUtils.isEmpty(taChannelProxy.getUserName())){
180
+            taChannelProxy.setUserName(map.get("userName").toString());
181
+        }
182
+        return ResponseBean.success(taChannelProxy);
172 183
     }
173 184
     
174 185
     @PostMapping("/center/signin")
@@ -177,34 +188,75 @@ public class SysUserController extends BaseController {
177 188
         if (params == null) {
178 189
             return ResponseBean.error("非法参数", ResponseBean.ERROR_MISSING_PARAMS);
179 190
         }
180
-        
191
+
192
+        QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
181 193
         String userName = params.getString("userName");
182
-        String userPassword = params.getString("password");
183
-        
194
+
195
+        taChannelProxyQueryWrapper.eq("user_name", userName).or().eq("channel_tel", userName);
196
+
184 197
         //验证用户名密码是否正确
185
-        QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
186
-        sysUserQueryWrapper.eq("user_name",userName);
187
-        sysUserQueryWrapper.eq("password", MD5Utils.md5(userPassword));
188
-        SysUser sysUser = iSysUserService.getOne(sysUserQueryWrapper);
189
-        if (sysUser == null) {
198
+        TaChannelProxy taChannelProxy = iTaChannelProxyService.getOne(taChannelProxyQueryWrapper);
199
+        String defaultPsw = MD5Utils.md5("abc@123");
200
+        if (taChannelProxy == null || !defaultPsw.equals(params.getString("password"))) {
190 201
             return ResponseBean.error("用户名或密码错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
191 202
         }
192
-        
193
-        if (sysUser.getStatus() != CommConstant.STATUS_NORMAL) {
194
-            return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
203
+
204
+        //校验是否过期且是否停用
205
+        if (LocalDateTime.now().isAfter(taChannelProxy.getExpireDate()) || taChannelProxy.getStatus() == 0){
206
+            return ResponseBean.error("当前后台服务已到期,请联系管理员", ResponseBean.ERROR_ILLEGAL_PARAMS);
195 207
         }
196
-        
197
-        String token = JWTUtils.newToken(sysUser.getUserName());
198
-    
208
+
209
+        Map map = new HashMap();
210
+        map.put("userName", StringUtils.isEmpty(taChannelProxy.getUserName()) ? taChannelProxy.getChannelTel() : taChannelProxy.getUserName());
211
+        map.put("channelId",taChannelProxy.getChannelId().toString());
212
+        String token = JWTUtils.newTokenByMap(map);
213
+
199 214
         //保存token
200 215
         sysTokenService.saveToken(token);
201 216
         
202 217
         Map<String, Object> result = new HashMap<>();
203 218
         result.put("token", token);
204
-        result.put("user", sysUser);
219
+        result.put("user", taChannelProxy);
205 220
         
206 221
         return ResponseBean.success(result);
207 222
     }
223
+
224
+    @PostMapping("/center/changePassword")
225
+    public ResponseBean changePassword(@RequestBody String paramStr) {
226
+        JSONObject params = JSONObject.parseObject(paramStr);
227
+        if (params == null) {
228
+            return ResponseBean.error("非法参数", ResponseBean.ERROR_MISSING_PARAMS);
229
+        }
230
+        String loginPassword = params.get("loginPassword").toString();
231
+        String newPassword = params.get("newPassword").toString();
232
+        String confirmPassword = params.get("confirmPassword").toString();
233
+
234
+        //校验密码
235
+        QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
236
+        taUserQueryWrapper.eq("user_id", params.get("userId"));
237
+        TaUser taUser = iTaUserService.getOne(taUserQueryWrapper);
238
+
239
+        if (!taUser.getLoginPassword().equals(MD5Utils.md5(MD5Utils.md5(loginPassword)))){
240
+            return ResponseBean.error("旧密码错误,请重新输入", ResponseBean.ERROR_UNAVAILABLE);
241
+        };
242
+
243
+        if (StringUtils.isEmpty(newPassword) || StringUtils.isEmpty(confirmPassword)){
244
+            return ResponseBean.error("请输入新密码", ResponseBean.ERROR_UNAVAILABLE);
245
+        }
246
+
247
+        if (!newPassword.equals(confirmPassword)){
248
+            return ResponseBean.error("两次密码不一致,请确认重新输入", ResponseBean.ERROR_UNAVAILABLE);
249
+        }
250
+
251
+        //重置密码
252
+        QueryWrapper<TaUser> updateWrapper = new QueryWrapper<>();
253
+        TaUser user = new TaUser();
254
+        user.setLoginPassword(MD5Utils.md5(MD5Utils.md5(newPassword)));
255
+        updateWrapper.eq("user_id", params.get("userId"));
256
+        iTaUserService.update(user, updateWrapper);
257
+
258
+        return ResponseBean.success("设置成功");
259
+    }
208 260
     
209 261
     @PostMapping("/center/signout")
210 262
     public ResponseBean signout(HttpServletRequest request) {

+ 34
- 4
src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java Vedi File

@@ -96,12 +96,41 @@ public class TaUserController extends BaseController {
96 96
      */
97 97
     @RequestMapping(value="/center/taUser",method= RequestMethod.GET)
98 98
     public ResponseBean taUserList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
99
-									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
99
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpServletRequest request){
100 100
         ResponseBean responseBean = new ResponseBean();
101
+        String userName = getChannelUserName(request);
102
+        Integer channelId = null;
103
+        if (!"admin".equals(userName)){
104
+            channelId = getChannelId(request);
105
+        }
106
+
101 107
         try {
102 108
             //使用分页插件
103 109
 		    IPage pg = new Page<>(pageNum, pageSize);
104
-            IPage<Map<String,Object>> result = iTaUserService.getPageList(pg);
110
+            IPage<Map<String,Object>> result = iTaUserService.getPageList(pg, channelId);
111
+            responseBean.addSuccess(result);
112
+        }catch (Exception e){
113
+            e.printStackTrace();
114
+            logger.error("taUserList -=- {}",e.toString());
115
+            responseBean.addError(e.getMessage());
116
+        }
117
+        return responseBean;
118
+    }
119
+
120
+    /**
121
+     * 分页查询列表
122
+     * @param pageNum
123
+     * @param pageSize
124
+     * @return
125
+     */
126
+    @RequestMapping(value="/channel/taUser",method= RequestMethod.GET)
127
+    public ResponseBean taUserChannelList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
128
+                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
129
+        ResponseBean responseBean = new ResponseBean();
130
+        try {
131
+            //使用分页插件
132
+            IPage pg = new Page<>(pageNum, pageSize);
133
+            IPage<Map<String,Object>> result = iTaUserService.getPageList(pg, null);
105 134
             responseBean.addSuccess(result);
106 135
         }catch (Exception e){
107 136
             e.printStackTrace();
@@ -117,10 +146,11 @@ public class TaUserController extends BaseController {
117 146
      * @return
118 147
      */
119 148
     @RequestMapping(value="/center/taUser",method= RequestMethod.POST)
120
-    public ResponseBean taUserAdd(@RequestBody TaUser taUser){
149
+    public ResponseBean taUserAdd(@RequestBody TaUser taUser, HttpServletRequest request){
121 150
         ResponseBean responseBean = new ResponseBean();
151
+        Integer channelId = getChannelId(request);
122 152
         try {
123
-            responseBean.addSuccess(iTaUserService.newUserAndOrg(taUser));
153
+            responseBean.addSuccess(iTaUserService.newUserAndOrg(taUser, channelId));
124 154
         }catch (Exception e){
125 155
             e.printStackTrace();
126 156
             logger.error("taUserAdd -=- {}",e.toString());

+ 12
- 0
src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java Vedi File

@@ -201,4 +201,16 @@ public class TaUser implements Serializable {
201 201
 
202 202
     @TableField(exist = false)
203 203
     private List<String> buildingIds = new ArrayList<String>();
204
+
205
+    /**
206
+     * 新密码
207
+     */
208
+    @TableField(exist = false)
209
+    private String newPassword;
210
+
211
+    /**
212
+     * 确认新密码
213
+     */
214
+    @TableField(exist = false)
215
+    private String confirmPassword;
204 216
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserMapper.java Vedi File

@@ -22,7 +22,7 @@ import java.util.Map;
22 22
 @Mapper
23 23
 public interface TaUserMapper extends BaseMapper<TaUser> {
24 24
 	
25
-	List<Map<String,Object>> getPageList(IPage<TaUser> pg);
25
+	List<Map<String,Object>> getPageList(IPage<TaUser> pg, @Param("channelId") Integer channelId);
26 26
 	
27 27
 	List<TaTags> getTagsList(@Param("userId") Integer userId,@Param("orgId") Integer orgId);
28 28
 	

+ 2
- 2
src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserService.java Vedi File

@@ -20,9 +20,9 @@ import java.util.Map;
20 20
  */
21 21
 public interface ITaUserService extends IService<TaUser> {
22 22
 	
23
-	IPage<Map<String,Object>> getPageList(IPage<TaUser> pg);
23
+	IPage<Map<String,Object>> getPageList(IPage<TaUser> pg, Integer channelId);
24 24
 
25
-    TaUser newUserAndOrg(TaUser taUser) throws Exception;
25
+    TaUser newUserAndOrg(TaUser taUser, Integer channelId) throws Exception;
26 26
 
27 27
     TaUser getInfoWithOrg(Integer id);
28 28
 

+ 6
- 4
src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java Vedi File

@@ -14,6 +14,8 @@ import com.huiju.estateagents.center.taUser.mapper.TaTagUserMapper;
14 14
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
15 15
 import com.huiju.estateagents.center.taUser.mapper.TaUserRoleMapper;
16 16
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
17
+import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
18
+import com.huiju.estateagents.channel.sysChannel.mapper.TaChannelProxyMapper;
17 19
 import com.huiju.estateagents.common.CommConstant;
18 20
 import com.huiju.estateagents.common.MD5Utils;
19 21
 import com.huiju.estateagents.common.StringUtils;
@@ -88,16 +90,16 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
88 90
 
89 91
 	@Autowired
90 92
 	private ISysOrgParamsService iSysOrgParamsService;
91
-	
93
+
92 94
 	@Override
93
-	public IPage<Map<String,Object>> getPageList(IPage pg) {
94
-		List<Map<String,Object>> taUserList = taUserMapper.getPageList(pg);
95
+	public IPage<Map<String,Object>> getPageList(IPage pg, Integer channelId) {
96
+		List<Map<String,Object>> taUserList = taUserMapper.getPageList(pg, channelId);
95 97
 		pg.setRecords(taUserList);
96 98
 		return pg;
97 99
 	}
98 100
 
99 101
 	@Override
100
-	public TaUser newUserAndOrg(TaUser taUser) throws Exception {
102
+	public TaUser newUserAndOrg(TaUser taUser, Integer channelId) throws Exception {
101 103
 		if (StringUtils.isEmpty(taUser.getPhone())) {
102 104
 			throw new Exception("电话号码不能为空");
103 105
 		}

+ 231
- 0
src/main/java/com/huiju/estateagents/channel/sysChannel/controller/SysUserChannelController.java Vedi File

@@ -0,0 +1,231 @@
1
+package com.huiju.estateagents.channel.sysUser.controller;
2
+
3
+import com.alibaba.fastjson.JSONObject;
4
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5
+import com.baomidou.mybatisplus.core.metadata.IPage;
6
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7
+import com.huiju.estateagents.base.BaseController;
8
+import com.huiju.estateagents.base.ResponseBean;
9
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
10
+import com.huiju.estateagents.center.sysUser.entity.SysUser;
11
+import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
12
+import com.huiju.estateagents.center.sysUser.service.ISysUserService;
13
+import com.huiju.estateagents.center.taUser.entity.TaUser;
14
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
15
+import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
16
+import com.huiju.estateagents.channel.sysChannel.service.ITaChannelProxyService;
17
+import com.huiju.estateagents.common.CommConstant;
18
+import com.huiju.estateagents.common.JWTUtils;
19
+import com.huiju.estateagents.common.MD5Utils;
20
+import com.huiju.estateagents.common.StringUtils;
21
+import com.huiju.estateagents.entity.TaNewsType;
22
+import io.swagger.annotations.ApiImplicitParam;
23
+import io.swagger.annotations.ApiImplicitParams;
24
+import io.swagger.annotations.ApiOperation;
25
+import org.slf4j.Logger;
26
+import org.slf4j.LoggerFactory;
27
+import org.springframework.beans.factory.annotation.Autowired;
28
+import org.springframework.web.bind.annotation.*;
29
+
30
+import javax.servlet.http.HttpServletRequest;
31
+import java.time.LocalDateTime;
32
+import java.time.LocalTime;
33
+import java.util.Date;
34
+import java.util.HashMap;
35
+import java.util.Map;
36
+
37
+/**
38
+ * <p>
39
+    * 系统用户 系统中心账户 前端控制器
40
+    * </p>
41
+ *
42
+ * @author jobob
43
+ * @since 2019-09-11
44
+ */
45
+@RestController
46
+@RequestMapping("/api")
47
+public class SysUserChannelController extends BaseController {
48
+
49
+    private final Logger logger = LoggerFactory.getLogger(SysUserChannelController.class);
50
+
51
+    @Autowired
52
+    public ISysUserService iSysUserService;
53
+    
54
+    @Autowired
55
+    private ISysTokenService sysTokenService;
56
+
57
+    @Autowired
58
+    private ITaChannelProxyService iTaChannelProxyService;
59
+
60
+    /**
61
+     * 修改对象
62
+     * @param sysUser 实体对象
63
+     * @return
64
+     */
65
+    @RequestMapping(value="/channel/sysUser",method= RequestMethod.PUT)
66
+    public ResponseBean sysUserUpdate(@RequestBody SysUser sysUser, HttpServletRequest request){
67
+        ResponseBean responseBean = new ResponseBean();
68
+        try {
69
+            String userName = JWTUtils.getSubject(request);
70
+            sysUser.setPassword(MD5Utils.md5(sysUser.getPassword()));
71
+            sysUser.setUserName(userName);
72
+            if (iSysUserService.updateById(sysUser)){
73
+                responseBean.addSuccess(sysUser);
74
+            }else {
75
+                responseBean.addError("fail");
76
+            }
77
+        }catch (Exception e){
78
+            e.printStackTrace();
79
+            logger.error("sysUserUpdate -=- {}",e.toString());
80
+            responseBean.addError(e.getMessage());
81
+        }
82
+        return responseBean;
83
+    }
84
+
85
+    @PostMapping("/channel/signin")
86
+    public ResponseBean signinChannel(@RequestBody String paramStr) {
87
+        JSONObject params = JSONObject.parseObject(paramStr);
88
+        if (params == null) {
89
+            return ResponseBean.error("非法参数", ResponseBean.ERROR_MISSING_PARAMS);
90
+        }
91
+
92
+        String userName = params.getString("userName");
93
+        String userPassword = params.getString("password");
94
+
95
+        //验证用户名密码是否正确
96
+        QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
97
+        sysUserQueryWrapper.eq("user_name",userName);
98
+        sysUserQueryWrapper.eq("password", MD5Utils.md5(userPassword));
99
+        sysUserQueryWrapper.eq("type", CommConstant.LOGIN_TYPE_CHANNEL);
100
+        SysUser sysUser = iSysUserService.getOne(sysUserQueryWrapper);
101
+        if (sysUser == null) {
102
+            return ResponseBean.error("用户名或密码错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
103
+        }
104
+
105
+        if (sysUser.getStatus() != CommConstant.STATUS_NORMAL) {
106
+            return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
107
+        }
108
+
109
+        String token = JWTUtils.newToken(sysUser.getUserName());
110
+
111
+        //保存token
112
+        sysTokenService.saveToken(token);
113
+
114
+        Map<String, Object> result = new HashMap<>();
115
+        result.put("token", token);
116
+        result.put("user", sysUser);
117
+
118
+        return ResponseBean.success(result);
119
+    }
120
+
121
+    @PostMapping("/channel/signout")
122
+    public ResponseBean signoutChannel(HttpServletRequest request) {
123
+        String token = JWTUtils.getToken(request);
124
+        QueryWrapper<SysToken> sysTokenQueryWrapper = new QueryWrapper<>();
125
+        sysTokenQueryWrapper.eq("token",token);
126
+        sysTokenService.remove(sysTokenQueryWrapper);
127
+        return ResponseBean.success("成功退出");
128
+    }
129
+
130
+    /**
131
+     * 根据id查询对象
132
+     * @param id  实体ID
133
+     */
134
+    @RequestMapping(value="/channel/current",method=RequestMethod.GET)
135
+    public ResponseBean currentChannelUser(HttpServletRequest request){
136
+        String userName = JWTUtils.getSubject(request);
137
+        QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
138
+        sysUserQueryWrapper.eq("user_name",userName);
139
+        sysUserQueryWrapper.eq("type",CommConstant.LOGIN_TYPE_CHANNEL);
140
+        SysUser sysUser = iSysUserService.getOne(sysUserQueryWrapper);
141
+        sysUser.setPassword(null);
142
+
143
+        return ResponseBean.success(sysUser);
144
+    }
145
+
146
+    /**
147
+     * 分页查询列表
148
+     * @param pageNum
149
+     * @param pageSize
150
+     * @return
151
+     */
152
+    @RequestMapping(value="/channel/taChannel",method= RequestMethod.GET)
153
+    public ResponseBean taUserList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
154
+                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
155
+        ResponseBean responseBean = new ResponseBean();
156
+        try {
157
+            //使用分页插件
158
+            IPage pg = new Page<>(pageNum, pageSize);
159
+            IPage<TaChannelProxy> result = iTaChannelProxyService.getChannelList(pg);
160
+            responseBean.addSuccess(result);
161
+        }catch (Exception e){
162
+            e.printStackTrace();
163
+            logger.error("taUserList -=- {}",e.toString());
164
+            responseBean.addError(e.getMessage());
165
+        }
166
+        return responseBean;
167
+    }
168
+
169
+    /**
170
+     * 新增代理商
171
+     * @param taChannelProxy
172
+     * @param request
173
+     * @return
174
+     */
175
+    @RequestMapping(value="/channel/taChannel",method= RequestMethod.POST)
176
+    public ResponseBean taUserList(@RequestBody TaChannelProxy taChannelProxy, HttpServletRequest request){
177
+        ResponseBean responseBean = new ResponseBean();
178
+        try {
179
+            if (taChannelProxy.getAppMaxNum() != null && taChannelProxy.getAppMaxNum() < 0){
180
+                responseBean.addError("维护小程序数量不得小于0");
181
+                return responseBean;
182
+            }
183
+
184
+            taChannelProxy.setStatus(1);
185
+            taChannelProxy.setCreateTime(LocalDateTime.now());
186
+            iTaChannelProxyService.save(taChannelProxy);
187
+        }catch (Exception e){
188
+            e.printStackTrace();
189
+            logger.error("taUserList -=- {}",e.toString());
190
+            responseBean.addError(e.getMessage());
191
+        }
192
+        return responseBean;
193
+    }
194
+
195
+    /**
196
+     * 根据id查询对象
197
+     * @param id  实体ID
198
+     */
199
+    @RequestMapping(value="/channel/taChannel/{id}",method= RequestMethod.GET)
200
+    public ResponseBean getChannelProxyById(@PathVariable Integer id){
201
+        ResponseBean responseBean = new ResponseBean();
202
+        QueryWrapper<TaChannelProxy> queryWrapper = new QueryWrapper<>();
203
+        queryWrapper.eq("channel_id", id);
204
+        TaChannelProxy taChannelProxy = iTaChannelProxyService.getOne(queryWrapper);
205
+        responseBean.addSuccess(taChannelProxy);
206
+        return responseBean;
207
+    }
208
+
209
+    /**
210
+     * 修改对象
211
+     * @param id
212
+     * @param taChannelProxy
213
+     * @param request
214
+     * @return
215
+     */
216
+    @RequestMapping(value="/channel/taChannel/{id}",method= RequestMethod.PUT)
217
+    public ResponseBean taNewsTypeUpdate(@PathVariable Integer id,
218
+                                         @RequestBody TaChannelProxy taChannelProxy, HttpServletRequest request){
219
+        ResponseBean responseBean = new ResponseBean();
220
+        if (taChannelProxy.getAppMaxNum() != null && taChannelProxy.getAppMaxNum() < 0){
221
+            responseBean.addError("维护小程序数量不得小于0");
222
+            return responseBean;
223
+        }
224
+
225
+        QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
226
+        taChannelProxyQueryWrapper.eq("channel_id", id);
227
+        iTaChannelProxyService.update(taChannelProxy, taChannelProxyQueryWrapper);
228
+        return ResponseBean.success("更新成功");
229
+    }
230
+
231
+}

+ 36
- 0
src/main/java/com/huiju/estateagents/channel/sysChannel/entity/TaChannelProxy.java Vedi File

@@ -0,0 +1,36 @@
1
+package com.huiju.estateagents.channel.sysChannel.entity;
2
+
3
+import com.baomidou.mybatisplus.annotation.TableField;
4
+import lombok.Data;
5
+import lombok.EqualsAndHashCode;
6
+import lombok.experimental.Accessors;
7
+
8
+import java.time.LocalDateTime;
9
+
10
+@Data
11
+@EqualsAndHashCode(callSuper = false)
12
+@Accessors(chain = true)
13
+public class TaChannelProxy {
14
+    private Integer channelId;
15
+
16
+    private String channelProxyName;
17
+
18
+    private String channelImg;
19
+
20
+    private String channelContactName;
21
+
22
+    private String channelTel;
23
+
24
+    private String userName;
25
+
26
+    private LocalDateTime expireDate;
27
+
28
+    private Integer status;
29
+
30
+    private Integer appMaxNum;
31
+
32
+    private LocalDateTime createTime;
33
+
34
+    @TableField(exist = false)
35
+    private Integer appCurrentNum;
36
+}

+ 12
- 0
src/main/java/com/huiju/estateagents/channel/sysChannel/mapper/TaChannelProxyMapper.java Vedi File

@@ -0,0 +1,12 @@
1
+package com.huiju.estateagents.channel.sysChannel.mapper;
2
+
3
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import com.baomidou.mybatisplus.core.metadata.IPage;
5
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
+import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
7
+import org.apache.ibatis.annotations.Mapper;
8
+
9
+@Mapper
10
+public interface TaChannelProxyMapper extends BaseMapper<TaChannelProxy> {
11
+    IPage<TaChannelProxy> getChannelList(IPage page);
12
+}

+ 10
- 0
src/main/java/com/huiju/estateagents/channel/sysChannel/service/ITaChannelProxyService.java Vedi File

@@ -0,0 +1,10 @@
1
+package com.huiju.estateagents.channel.sysChannel.service;
2
+
3
+import com.baomidou.mybatisplus.core.metadata.IPage;
4
+import com.baomidou.mybatisplus.extension.service.IService;
5
+import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
6
+
7
+
8
+public interface ITaChannelProxyService extends IService<TaChannelProxy> {
9
+    IPage<TaChannelProxy> getChannelList(IPage page);
10
+}

+ 38
- 0
src/main/java/com/huiju/estateagents/channel/sysChannel/service/impl/TaChannelProxyServiceImpl.java Vedi File

@@ -0,0 +1,38 @@
1
+package com.huiju.estateagents.channel.sysChannel.service.impl;
2
+
3
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4
+import com.baomidou.mybatisplus.core.metadata.IPage;
5
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7
+import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
8
+import com.huiju.estateagents.channel.sysChannel.mapper.TaChannelProxyMapper;
9
+import com.huiju.estateagents.channel.sysChannel.service.ITaChannelProxyService;
10
+import com.huiju.estateagents.entity.TaChannelAppRelation;
11
+import com.huiju.estateagents.mapper.TaChannelAppRelationMapper;
12
+import org.apache.commons.collections.CollectionUtils;
13
+import org.springframework.beans.factory.annotation.Autowired;
14
+import org.springframework.stereotype.Service;
15
+
16
+@Service
17
+public class TaChannelProxyServiceImpl extends ServiceImpl<TaChannelProxyMapper, TaChannelProxy>  implements ITaChannelProxyService {
18
+    @Autowired
19
+    private TaChannelProxyMapper taChannelProxyMapper;
20
+
21
+    @Autowired
22
+    private TaChannelAppRelationMapper taChannelAppRelationMapper;
23
+
24
+    @Override
25
+    public IPage<TaChannelProxy> getChannelList(IPage page) {
26
+        IPage<TaChannelProxy> taChannelProxyIPage = taChannelProxyMapper.getChannelList(page);
27
+        if (CollectionUtils.isNotEmpty(taChannelProxyIPage.getRecords())){
28
+            taChannelProxyIPage.getRecords().forEach(e->{
29
+                QueryWrapper<TaChannelAppRelation> taChannelAppRelationQueryWrapper = new QueryWrapper<>();
30
+                taChannelAppRelationQueryWrapper.eq("channel_id", e.getChannelId());
31
+                taChannelAppRelationQueryWrapper.groupBy("channel_id");
32
+                e.setAppCurrentNum(taChannelAppRelationMapper.selectCount(taChannelAppRelationQueryWrapper));
33
+            });
34
+            taChannelProxyIPage.setRecords(taChannelProxyIPage.getRecords());
35
+        }
36
+        return taChannelProxyIPage;
37
+    }
38
+}

+ 10
- 0
src/main/java/com/huiju/estateagents/common/CommConstant.java Vedi File

@@ -545,4 +545,14 @@ public class CommConstant {
545 545
      * 进入小程序
546 546
      */
547 547
     public static final String BIZ_EVENT_START = "start";
548
+
549
+    /**
550
+     * 登录渠道端系统类型
551
+     */
552
+    public static final String LOGIN_TYPE_CHANNEL = "channel";
553
+
554
+    /**
555
+     * 登录中心端系统类型
556
+     */
557
+    public static final String LOGIN_TYPE_CENTER = "center";
548 558
 }

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaMiniappController.java Vedi File

@@ -79,9 +79,9 @@ public class TaMiniappController extends BaseController {
79 79
     @RequestMapping(value="/center/taMiniapp",method= RequestMethod.POST)
80 80
     public ResponseBean taMiniappAdd(@RequestBody TaMiniapp taMiniapp, HttpServletRequest request){
81 81
         ResponseBean responseBean = new ResponseBean();
82
-
82
+        Integer channelId = getChannelId(request);
83 83
         try {
84
-            iTaMiniappService.saveInfoWithTpls(taMiniapp);
84
+            iTaMiniappService.saveInfoWithTpls(taMiniapp, channelId);
85 85
             responseBean.addSuccess(taMiniapp);
86 86
         }catch (Exception e){
87 87
             e.printStackTrace();

+ 15
- 0
src/main/java/com/huiju/estateagents/entity/TaBuilding.java Vedi File

@@ -198,6 +198,21 @@ public class TaBuilding implements Serializable {
198 198
      */
199 199
     private Integer mapScope;
200 200
 
201
+    /**
202
+     * 开发商
203
+     */
204
+    private String propertyDeveloper;
205
+
206
+    /**
207
+     * 楼栋总数
208
+     */
209
+    private Integer buildingNum;
210
+
211
+    /**
212
+     * 备案名
213
+     */
214
+    private String recordName;
215
+
201 216
     /**
202 217
      * 地图数据
203 218
      */

+ 49
- 0
src/main/java/com/huiju/estateagents/entity/TaChannelAppRelation.java Vedi File

@@ -0,0 +1,49 @@
1
+package com.huiju.estateagents.entity;
2
+
3
+import com.baomidou.mybatisplus.annotation.IdType;
4
+import com.baomidou.mybatisplus.annotation.TableId;
5
+import lombok.Data;
6
+import lombok.EqualsAndHashCode;
7
+import lombok.experimental.Accessors;
8
+
9
+import java.io.Serializable;
10
+import java.time.LocalDateTime;
11
+
12
+/**
13
+ * <p>
14
+ * 渠道小程序关系表
15
+ * </p>
16
+ *
17
+ * @author jobob
18
+ * @since 2020-01-04
19
+ */
20
+@Data
21
+@EqualsAndHashCode(callSuper = false)
22
+@Accessors(chain = true)
23
+public class TaChannelAppRelation implements Serializable {
24
+
25
+    private static final long serialVersionUID = 1L;
26
+
27
+    /**
28
+     * 关系id
29
+     */
30
+    @TableId(value = "relation_id", type = IdType.AUTO)
31
+    private Integer relationId;
32
+
33
+    /**
34
+     * 渠道id
35
+     */
36
+    private Integer channelId;
37
+
38
+    /**
39
+     * 公司id
40
+     */
41
+    private Integer orgId;
42
+
43
+    /**
44
+     * 创建时间
45
+     */
46
+    private LocalDateTime createTime;
47
+
48
+
49
+}

+ 1
- 0
src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java Vedi File

@@ -56,6 +56,7 @@ public class AccessInterceptor implements HandlerInterceptor {
56 56
             "/api/taCheckin/activity",
57 57
             "/api/wx/qrcode/scene",
58 58
 		    "/api/center/signin",
59
+            "/api/channel/signin",
59 60
 		    "/api/admin/taUser/signin",
60 61
             "/swagger-resources/configuration/ui",
61 62
             "/swagger-resources",

+ 18
- 0
src/main/java/com/huiju/estateagents/mapper/TaChannelAppRelationMapper.java Vedi File

@@ -0,0 +1,18 @@
1
+package com.huiju.estateagents.mapper;
2
+
3
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import com.huiju.estateagents.entity.TaChannelAppRelation;
5
+import org.apache.ibatis.annotations.Mapper;
6
+
7
+/**
8
+ * <p>
9
+ * 渠道小程序关系表 Mapper 接口
10
+ * </p>
11
+ *
12
+ * @author jobob
13
+ * @since 2020-01-04
14
+ */
15
+@Mapper
16
+public interface TaChannelAppRelationMapper extends BaseMapper<TaChannelAppRelation> {
17
+
18
+}

+ 16
- 0
src/main/java/com/huiju/estateagents/service/ITaChannelAppRelationService.java Vedi File

@@ -0,0 +1,16 @@
1
+package com.huiju.estateagents.service;
2
+
3
+import com.baomidou.mybatisplus.extension.service.IService;
4
+import com.huiju.estateagents.entity.TaChannelAppRelation;
5
+
6
+/**
7
+ * <p>
8
+ * 渠道小程序关系表 服务类
9
+ * </p>
10
+ *
11
+ * @author jobob
12
+ * @since 2020-01-04
13
+ */
14
+public interface ITaChannelAppRelationService extends IService<TaChannelAppRelation> {
15
+
16
+}

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaMiniappService.java Vedi File

@@ -13,5 +13,5 @@ import com.huiju.estateagents.entity.TaMiniapp;
13 13
  */
14 14
 public interface ITaMiniappService extends IService<TaMiniapp> {
15 15
 
16
-    TaMiniapp saveInfoWithTpls(TaMiniapp taMiniapp) throws Exception;
16
+    TaMiniapp saveInfoWithTpls(TaMiniapp taMiniapp, Integer channelId) throws Exception;
17 17
 }

+ 4
- 1
src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java Vedi File

@@ -902,7 +902,10 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
902 902
         queryWrapper.eq("building_id", taBuilding.getBuildingId());
903 903
         queryWrapper.eq("org_id", orgId);
904 904
         TaBuilding info = taBuildingMapper.selectOne(queryWrapper);
905
-        if (operte.equals("update") && (taBuilding.getIsMain() != 1 || info.getStatus() == 2)){
905
+        if (taBuilding.getIsMain() != 1){
906
+            return true;
907
+        }
908
+        if (operte.equals("update") && (info.getStatus() == 2)){
906 909
             return true;
907 910
         }
908 911
         if (operte.equals("updateStatus") && status == 2){

+ 20
- 0
src/main/java/com/huiju/estateagents/service/impl/TaChannelAppRelationServiceImpl.java Vedi File

@@ -0,0 +1,20 @@
1
+package com.huiju.estateagents.service.impl;
2
+
3
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
4
+import com.huiju.estateagents.entity.TaChannelAppRelation;
5
+import com.huiju.estateagents.mapper.TaChannelAppRelationMapper;
6
+import com.huiju.estateagents.service.ITaChannelAppRelationService;
7
+import org.springframework.stereotype.Service;
8
+
9
+/**
10
+ * <p>
11
+ * 渠道小程序关系表 服务实现类
12
+ * </p>
13
+ *
14
+ * @author jobob
15
+ * @since 2020-01-04
16
+ */
17
+@Service
18
+public class TaChannelAppRelationServiceImpl extends ServiceImpl<TaChannelAppRelationMapper, TaChannelAppRelation> implements ITaChannelAppRelationService {
19
+
20
+}

+ 33
- 1
src/main/java/com/huiju/estateagents/service/impl/TaMiniappServiceImpl.java Vedi File

@@ -3,10 +3,14 @@ package com.huiju.estateagents.service.impl;
3 3
 import cn.binarywang.wx.miniapp.api.WxMaService;
4 4
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5 5
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
6
+import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
7
+import com.huiju.estateagents.channel.sysChannel.mapper.TaChannelProxyMapper;
6 8
 import com.huiju.estateagents.common.StringUtils;
7 9
 import com.huiju.estateagents.common.WxUtils;
10
+import com.huiju.estateagents.entity.TaChannelAppRelation;
8 11
 import com.huiju.estateagents.entity.TaMiniapp;
9 12
 import com.huiju.estateagents.entity.TaMiniappTemplate;
13
+import com.huiju.estateagents.mapper.TaChannelAppRelationMapper;
10 14
 import com.huiju.estateagents.mapper.TaMiniappMapper;
11 15
 import com.huiju.estateagents.mapper.TaMiniappTemplateMapper;
12 16
 import com.huiju.estateagents.service.ITaMiniappService;
@@ -14,6 +18,8 @@ import org.checkerframework.checker.units.qual.A;
14 18
 import org.springframework.beans.factory.annotation.Autowired;
15 19
 import org.springframework.stereotype.Service;
16 20
 
21
+import java.time.LocalDateTime;
22
+
17 23
 /**
18 24
  * <p>
19 25
  * 小程序表  服务实现类
@@ -30,8 +36,14 @@ public class TaMiniappServiceImpl extends ServiceImpl<TaMiniappMapper, TaMiniapp
30 36
     @Autowired
31 37
     WxUtils wxUtils;
32 38
 
39
+    @Autowired
40
+    private TaChannelAppRelationMapper taChannelAppRelationMapper;
41
+
42
+    @Autowired
43
+    private TaChannelProxyMapper taChannelProxyMapper;
44
+
33 45
     @Override
34
-    public TaMiniapp saveInfoWithTpls(TaMiniapp taMiniapp) throws Exception {
46
+    public TaMiniapp saveInfoWithTpls(TaMiniapp taMiniapp, Integer channelId) throws Exception {
35 47
         if (StringUtils.isEmpty(taMiniapp.getMiniappId())) {
36 48
             throw new Exception("请填写小程序 AppID");
37 49
         }
@@ -48,6 +60,26 @@ public class TaMiniappServiceImpl extends ServiceImpl<TaMiniappMapper, TaMiniapp
48 60
             throw new Exception("未知的小程序所属对象");
49 61
         }
50 62
 
63
+        //判断渠道端新增小程序最大数
64
+        QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
65
+        taChannelProxyQueryWrapper.eq("channel_id", channelId);
66
+        TaChannelProxy taChannelProxy = taChannelProxyMapper.selectOne(taChannelProxyQueryWrapper);
67
+
68
+        QueryWrapper<TaChannelAppRelation> relationQueryWrapper = new QueryWrapper<>();
69
+        relationQueryWrapper.eq("channel_id", channelId);
70
+        Integer miniAppCount = taChannelAppRelationMapper.selectCount(relationQueryWrapper);
71
+        if (miniAppCount >= taChannelProxy.getAppMaxNum()){
72
+            throw new Exception("当前系统仅供维护"+ taChannelProxy.getAppMaxNum() +"个小程序,需要维护更多项目,请联系相关管理人员");
73
+        }
74
+
75
+        //维护渠道和小程序关系
76
+        TaChannelAppRelation taChannelAppRelation = new TaChannelAppRelation();
77
+        taChannelAppRelation.setChannelId(channelId);
78
+        taChannelAppRelation.setOrgId(taMiniapp.getOrgId());
79
+        taChannelAppRelation.setCreateTime(LocalDateTime.now());
80
+        taChannelAppRelationMapper.insert(taChannelAppRelation);
81
+
82
+
51 83
         TaMiniapp orign = this.getById(taMiniapp.getMiniappId());
52 84
         if (null != orign) {
53 85
             if (!this.updateById(taMiniapp)) {

+ 5
- 0
src/main/resources/mapper/TaChannelAppRelationMapper.xml Vedi File

@@ -0,0 +1,5 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3
+<mapper namespace="com.huiju.estateagents.mapper.TaChannelAppRelationMapper">
4
+
5
+</mapper>

+ 8
- 0
src/main/resources/mapper/TaChannelProxyMapper.xml Vedi File

@@ -0,0 +1,8 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3
+<mapper namespace="com.huiju.estateagents.channel.sysChannel.mapper.TaChannelProxyMapper">
4
+
5
+    <select id="getChannelList" resultType="com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy">
6
+        select * from ta_channel_proxy t
7
+    </select>
8
+</mapper>

+ 1
- 1
src/main/resources/mapper/TaRecommendCustomerMapper.xml Vedi File

@@ -612,7 +612,7 @@ FROM
612 612
         b.tel as consultTel
613 613
         FROM
614 614
         ta_recommend_customer a
615
-        LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
615
+        LEFT JOIN ta_person b ON (a.realty_consultant = b.person_id or a.realty_consultant = b.user_id)
616 616
         LEFT JOIN ta_person c on a.recommend_person = c.person_id
617 617
         <where>
618 618
             a.status > 0

+ 7
- 1
src/main/resources/mapper/TaUserMapper.xml Vedi File

@@ -20,13 +20,19 @@
20 20
             m.secret,
21 21
             m.token,
22 22
             m.NAME AS miniappName,
23
-            m.qr_code AS qrCode
23
+            m.qr_code AS qrCode,
24
+            z.expire_date
24 25
         FROM
25 26
             ta_user t
26 27
             LEFT JOIN ta_org o ON t.org_id = o.org_id
27 28
             LEFT JOIN ta_miniapp m ON o.org_id = m.org_id
29
+            left join ta_channel_app_relation n on m.org_id = n.org_id
30
+            left join ta_channel_proxy z on z.channel_id = n.channel_id
28 31
         WHERE
29 32
             t.is_admin =1
33
+            <if test="channelId != null and channelId != ''">
34
+                and n.channel_id = #{channelId}
35
+            </if>
30 36
     </select>
31 37
 
32 38
     <select id="getTagsList" resultType="com.huiju.estateagents.center.taUser.entity.TaTags">