傅行帆 преди 5 години
родител
ревизия
6f805912e9

+ 14
- 0
src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java Целия файл

13
 import com.huiju.estateagents.center.taUser.entity.TaTagUser;
13
 import com.huiju.estateagents.center.taUser.entity.TaTagUser;
14
 import com.huiju.estateagents.center.taUser.entity.TaTags;
14
 import com.huiju.estateagents.center.taUser.entity.TaTags;
15
 import com.huiju.estateagents.center.taUser.entity.TaUser;
15
 import com.huiju.estateagents.center.taUser.entity.TaUser;
16
+import com.huiju.estateagents.center.taUser.entity.TaUserRole;
16
 import com.huiju.estateagents.center.taUser.service.ITaTagUserService;
17
 import com.huiju.estateagents.center.taUser.service.ITaTagUserService;
17
 import com.huiju.estateagents.center.taUser.service.ITaUserAuthButtonService;
18
 import com.huiju.estateagents.center.taUser.service.ITaUserAuthButtonService;
18
 import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
19
 import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
20
+import com.huiju.estateagents.center.taUser.service.ITaUserRoleService;
19
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
21
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
20
 import com.huiju.estateagents.common.CommConstant;
22
 import com.huiju.estateagents.common.CommConstant;
21
 import com.huiju.estateagents.common.JWTUtils;
23
 import com.huiju.estateagents.common.JWTUtils;
76
     
78
     
77
     @Autowired
79
     @Autowired
78
     private ITaPersonBuildingService taPersonBuildingService;
80
     private ITaPersonBuildingService taPersonBuildingService;
81
+    
82
+    @Autowired
83
+    private ITaUserRoleService taUserRoleService;
79
 
84
 
80
     /**
85
     /**
81
      * 分页查询列表
86
      * 分页查询列表
357
                 tags.add(e.getTagId());
362
                 tags.add(e.getTagId());
358
             });
363
             });
359
             taUser.setTaTags(tags);
364
             taUser.setTaTags(tags);
365
+            //获取角色信息
366
+            QueryWrapper<TaUserRole> taUserRoleQueryWrapper = new QueryWrapper<>();
367
+            taUserRoleQueryWrapper.eq("user_id",id);
368
+            List<TaUserRole> taUserRoleList = taUserRoleService.list(taUserRoleQueryWrapper);
369
+            List<Integer> ids = new ArrayList<>();
370
+            taUserRoleList.forEach(e -> {
371
+                ids.add(e.getRoleId());
372
+            });
373
+            taUser.setRoleIds(ids);
360
             taUser.setLoginPassword("");
374
             taUser.setLoginPassword("");
361
             QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
375
             QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
362
             taPersonBuildingQueryWrapper.eq("user_id",taUser.getUserId());
376
             taPersonBuildingQueryWrapper.eq("user_id",taUser.getUserId());

+ 3
- 0
src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java Целия файл

153
     @TableField(exist = false)
153
     @TableField(exist = false)
154
     private List<Integer> taTags = new ArrayList<Integer>();
154
     private List<Integer> taTags = new ArrayList<Integer>();
155
     
155
     
156
+    @TableField(exist = false)
157
+    private List<Integer> roleIds = new ArrayList<Integer>();
158
+    
156
     @TableField(exist = false)
159
     @TableField(exist = false)
157
     private String buildingId;
160
     private String buildingId;
158
 }
161
 }

+ 26
- 0
src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java Целия файл

6
 import com.huiju.estateagents.center.taUser.entity.TaTagUser;
6
 import com.huiju.estateagents.center.taUser.entity.TaTagUser;
7
 import com.huiju.estateagents.center.taUser.entity.TaTags;
7
 import com.huiju.estateagents.center.taUser.entity.TaTags;
8
 import com.huiju.estateagents.center.taUser.entity.TaUser;
8
 import com.huiju.estateagents.center.taUser.entity.TaUser;
9
+import com.huiju.estateagents.center.taUser.entity.TaUserRole;
9
 import com.huiju.estateagents.center.taUser.mapper.TaTagUserMapper;
10
 import com.huiju.estateagents.center.taUser.mapper.TaTagUserMapper;
10
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
11
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
12
+import com.huiju.estateagents.center.taUser.mapper.TaUserRoleMapper;
11
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
13
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
12
 import com.huiju.estateagents.common.CommConstant;
14
 import com.huiju.estateagents.common.CommConstant;
13
 import com.huiju.estateagents.common.MD5Utils;
15
 import com.huiju.estateagents.common.MD5Utils;
62
 	@Autowired
64
 	@Autowired
63
 	private TaPersonMapper taPersonMapper;
65
 	private TaPersonMapper taPersonMapper;
64
 	
66
 	
67
+	@Autowired
68
+	private TaUserRoleMapper taUserRoleMapper;
69
+	
65
 	@Override
70
 	@Override
66
 	public IPage<Map<String,Object>> getPageList(IPage pg) {
71
 	public IPage<Map<String,Object>> getPageList(IPage pg) {
67
 		List<Map<String,Object>> taUserList = taUserMapper.getPageList(pg);
72
 		List<Map<String,Object>> taUserList = taUserMapper.getPageList(pg);
229
 			taTagUserMapper.insert(taTagUser);
234
 			taTagUserMapper.insert(taTagUser);
230
 		});
235
 		});
231
 		
236
 		
237
+		//保存用户角色
238
+		List<Integer> roleIds = taUser.getRoleIds();
239
+		roleIds.forEach(e -> {
240
+			TaUserRole taUserRole = new TaUserRole();
241
+			taUserRole.setUserId(taUser.getUserId());
242
+			taUserRole.setRoleId(e);
243
+			taUserRoleMapper.insert(taUserRole);
244
+		});
245
+		
232
 		//保存项目
246
 		//保存项目
233
 		TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
247
 		TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
234
 		taPersonBuilding.setBuildingId(taUser.getBuildingId());
248
 		taPersonBuilding.setBuildingId(taUser.getBuildingId());
274
 			taTagUserMapper.insert(taTagUser);
288
 			taTagUserMapper.insert(taTagUser);
275
 		});
289
 		});
276
 		
290
 		
291
+		QueryWrapper<TaUserRole> taUserRoleQueryWrapper = new QueryWrapper<>();
292
+		taUserRoleQueryWrapper.eq("user_id",taUser.getUserId());
293
+		taUserRoleMapper.delete(taUserRoleQueryWrapper);
294
+		//保存用户角色
295
+		List<Integer> roleIds = taUser.getRoleIds();
296
+		roleIds.forEach(e -> {
297
+			TaUserRole taUserRole = new TaUserRole();
298
+			taUserRole.setUserId(taUser.getUserId());
299
+			taUserRole.setRoleId(e);
300
+			taUserRoleMapper.insert(taUserRole);
301
+		});
302
+		
277
 		QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
303
 		QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
278
 		taPersonBuildingQueryWrapper.eq("user_id",taUser.getUserId());
304
 		taPersonBuildingQueryWrapper.eq("user_id",taUser.getUserId());
279
 		taPersonBuildingMapper.delete(taPersonBuildingQueryWrapper);
305
 		taPersonBuildingMapper.delete(taPersonBuildingQueryWrapper);