Merge branch 'v1' of http://git.quantgroup.cn/QG/cash-loan-flow-boss into v1

# By xiaozhe.chen
# Via xiaozhe.chen
* 'v1' of http://git.quantgroup.cn/QG/cash-loan-flow-boss:
  添加channelUser

src/main/java/cn/quantgroup/cashloanflowboss/api/user/entity/boss/ChannelUser.java

+package cn.quantgroup.cashloanflowboss.api.user.entity.boss;
+
+import cn.quantgroup.cashloanflowboss.core.persistence.Primary;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+@Data
+@Entity
+@Table(name = "channel_user")
+public class ChannelUser extends Primary {
+    @Column(name = "channel_id")
+    private Long channelId;
+    @Column(name = "user_id")
+    private Long userId;
+}

src/main/java/cn/quantgroup/cashloanflowboss/api/user/repository/boss/ChannelUserRepository.java

+package cn.quantgroup.cashloanflowboss.api.user.repository.boss;
+
+import cn.quantgroup.cashloanflowboss.api.user.entity.boss.ChannelUser;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by WeiWei on 2019/7/22.
+ */
+@Repository
+public interface ChannelUserRepository extends PagingAndSortingRepository<ChannelUser, String> {
+
+    ChannelUser findByUserId(Long userId);
+
+}

src/main/java/cn/quantgroup/cashloanflowboss/api/user/service/ChannelUserService.java

+package cn.quantgroup.cashloanflowboss.api.user.service;
+
+import cn.quantgroup.cashloanflowboss.api.user.entity.boss.ChannelUser;
+import cn.quantgroup.cashloanflowboss.api.user.repository.boss.ChannelUserRepository;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class ChannelUserService {
+
+    @Autowired
+    private ChannelUserRepository channelUserRepository;
+
+
+    public ChannelUser findChannelUserByUserId(Long userId) {
+        return channelUserRepository.findByUserId(userId);
+    }
+
+}

src/main/java/cn/quantgroup/cashloanflowboss/api/user/service/UserSessionService.java

@@ -3,6 +3,7 @@ package cn.quantgroup.cashloanflowboss.api.user.service;
 import cn.quantgroup.cashloanflowboss.api.role.entity.boss.Permission;
 import cn.quantgroup.cashloanflowboss.api.role.entity.boss.Role;
 import cn.quantgroup.cashloanflowboss.api.role.service.RoleService;
+import cn.quantgroup.cashloanflowboss.api.user.entity.boss.ChannelUser;
 import cn.quantgroup.cashloanflowboss.api.user.entity.boss.User;
 import cn.quantgroup.cashloanflowboss.api.user.model.RoleInfo;
 import cn.quantgroup.cashloanflowboss.api.user.model.UserInfo;
@@ -28,21 +29,29 @@ public class UserSessionService {
 
     @Autowired
     private RoleService roleService;
+    @Autowired
+    private ChannelUserService channelUserService;
 
     public void setUserSessionInfo(User user) {
 
         //set user,role,channel or permission info
         Role role = roleService.findRoleByUserId(user.getId());
         String roleName = null, userName = user.getUsername();
-        Long roleId = null, userId = user.getId();
+        Long roleId = null, channelId = null, userId = user.getId();
         if (null != role) {
             roleName = role.getName();
             roleId = role.getId();
         }
 
+        ChannelUser channelUser = channelUserService.findChannelUserByUserId(userId);
+        if (null != channelUser) {
+            channelId = channelUser.getChannelId();
+        }
+
         UserSessionInfo userSessionInfo = UserSessionInfo.builder()
                 .roleInfo(RoleInfo.builder().roleId(roleId).roleName(roleName).build())
                 .userInfo(UserInfo.builder().userId(userId).userName(userName).build())
+                .channelId(channelId)
                 .build();
 
         HttpSession session = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest().getSession();