Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -119,6 +120,9 @@ public class SysUser implements Serializable{
 	
 	private Integer teacherId;
 
+	@ApiModelProperty(value = "用户角色",required = false)
+	private List<Integer> roles;
+
 	public Integer getServiceTag() {
 		return serviceTag;
 	}
@@ -359,6 +363,14 @@ public class SysUser implements Serializable{
 		this.teacherId = teacherId;
 	}
 
+	public List<Integer> getRoles() {
+		return roles;
+	}
+
+	public void setRoles(List<Integer> roles) {
+		this.roles = roles;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-web/src/main/java/com/ym/mec/web/controller/EmployeeController.java

@@ -2,6 +2,7 @@ package com.ym.mec.web.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.EmployeeDao;
 import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.enums.EmployeeOperateEnum;
 import com.ym.mec.biz.dal.page.EmployeeQueryInfo;
@@ -38,6 +39,8 @@ public class EmployeeController extends BaseController {
     private StudentManageService studentManageService;
     @Autowired
     private OrganizationService organizationService;
+    @Autowired
+    private EmployeeDao employeeDao;
 
     @ApiOperation(value = "根据部门获取下面的员工")
     @GetMapping("/queryEmployByOrganId")
@@ -124,6 +127,7 @@ public class EmployeeController extends BaseController {
         if(sysUser != null && sysUser.getId() != null){
             Employee employee = employeeService.get(sysUser.getId());
             sysUser.setOrganName(organizationService.getOrganName(employee.getOrganIdList()));
+            sysUser.setRoles(employeeDao.queryUserRole(sysUser.getId()));
             return succeed(sysUser);
         }
         return failed("获取用户信息失败");