角色

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

@@ -13,9 +13,11 @@ import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
 import com.huiju.estateagents.center.taUser.entity.TaTagUser;
 import com.huiju.estateagents.center.taUser.entity.TaTags;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.entity.TaUserRole;
 import com.huiju.estateagents.center.taUser.service.ITaTagUserService;
 import com.huiju.estateagents.center.taUser.service.ITaUserAuthButtonService;
 import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
+import com.huiju.estateagents.center.taUser.service.ITaUserRoleService;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
@@ -76,6 +78,9 @@ public class TaUserController extends BaseController {
     
     @Autowired
     private ITaPersonBuildingService taPersonBuildingService;
+    
+    @Autowired
+    private ITaUserRoleService taUserRoleService;
 
     /**
      * 分页查询列表
@@ -357,6 +362,15 @@ public class TaUserController extends BaseController {
                 tags.add(e.getTagId());
             });
             taUser.setTaTags(tags);
+            //获取角色信息
+            QueryWrapper<TaUserRole> taUserRoleQueryWrapper = new QueryWrapper<>();
+            taUserRoleQueryWrapper.eq("user_id",id);
+            List<TaUserRole> taUserRoleList = taUserRoleService.list(taUserRoleQueryWrapper);
+            List<Integer> ids = new ArrayList<>();
+            taUserRoleList.forEach(e -> {
+                ids.add(e.getRoleId());
+            });
+            taUser.setRoleIds(ids);
             taUser.setLoginPassword("");
             QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
             taPersonBuildingQueryWrapper.eq("user_id",taUser.getUserId());

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -153,6 +153,9 @@ public class TaUser implements Serializable {
     @TableField(exist = false)
     private List<Integer> taTags = new ArrayList<Integer>();
     
+    @TableField(exist = false)
+    private List<Integer> roleIds = new ArrayList<Integer>();
+    
     @TableField(exist = false)
     private String buildingId;
 }

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.center.taUser.entity.TaTagUser;
 import com.huiju.estateagents.center.taUser.entity.TaTags;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.entity.TaUserRole;
 import com.huiju.estateagents.center.taUser.mapper.TaTagUserMapper;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.center.taUser.mapper.TaUserRoleMapper;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.MD5Utils;
@@ -62,6 +64,9 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 	@Autowired
 	private TaPersonMapper taPersonMapper;
 	
+	@Autowired
+	private TaUserRoleMapper taUserRoleMapper;
+	
 	@Override
 	public IPage<Map<String,Object>> getPageList(IPage pg) {
 		List<Map<String,Object>> taUserList = taUserMapper.getPageList(pg);
@@ -229,6 +234,15 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			taTagUserMapper.insert(taTagUser);
 		});
 		
+		//保存用户角色
+		List<Integer> roleIds = taUser.getRoleIds();
+		roleIds.forEach(e -> {
+			TaUserRole taUserRole = new TaUserRole();
+			taUserRole.setUserId(taUser.getUserId());
+			taUserRole.setRoleId(e);
+			taUserRoleMapper.insert(taUserRole);
+		});
+		
 		//保存项目
 		TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
 		taPersonBuilding.setBuildingId(taUser.getBuildingId());
@@ -274,6 +288,18 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			taTagUserMapper.insert(taTagUser);
 		});
 		
+		QueryWrapper<TaUserRole> taUserRoleQueryWrapper = new QueryWrapper<>();
+		taUserRoleQueryWrapper.eq("user_id",taUser.getUserId());
+		taUserRoleMapper.delete(taUserRoleQueryWrapper);
+		//保存用户角色
+		List<Integer> roleIds = taUser.getRoleIds();
+		roleIds.forEach(e -> {
+			TaUserRole taUserRole = new TaUserRole();
+			taUserRole.setUserId(taUser.getUserId());
+			taUserRole.setRoleId(e);
+			taUserRoleMapper.insert(taUserRole);
+		});
+		
 		QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
 		taPersonBuildingQueryWrapper.eq("user_id",taUser.getUserId());
 		taPersonBuildingMapper.delete(taPersonBuildingQueryWrapper);