update

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

@@ -48,6 +48,10 @@ public class SysUser implements Serializable{
 	@ApiModelProperty(value = "部门ID",required = false)
 	private Integer organId;
 
+	/** 部门ID */
+	@ApiModelProperty(value = "部门名称",required = false)
+	private String organName;
+
 	/** 创建时间 */
 	private java.util.Date createTime;
 
@@ -101,6 +105,14 @@ public class SysUser implements Serializable{
 	@ApiModelProperty(value = "是否是超管",required = false)
 	private Boolean isSuperAdmin;
 
+	public String getOrganName() {
+		return organName;
+	}
+
+	public void setOrganName(String organName) {
+		this.organName = organName;
+	}
+
 	public String getRealName() {
 		return realName;
 	}

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/dal/dao/SysUserDao.java

@@ -45,4 +45,11 @@ public interface SysUserDao extends BaseDAO<Integer, SysUser> {
 	 * @return
 	 */
 	List<SysUser> queryByStatus(UserLockFlag status);
+
+	/**
+	 * 获取机构名称
+	 * @param organId
+	 * @return
+	 */
+    String getOrganName(Integer organId);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/SysUserService.java

@@ -68,4 +68,11 @@ public interface SysUserService extends BaseService<Integer, SysUser> {
 	 * @param sysUser
 	 */
     void updateBaseInfo(SysUser sysUser);
+
+	/**
+	 * 获取用户基本信息
+	 * @param userId
+	 * @return
+	 */
+	SysUser queryUserInfo(Integer userId);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysUserServiceImpl.java

@@ -128,4 +128,11 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 		imFeignService.update(new ImUserModel(sysUser.getId().toString(),sysUser.getUsername(),sysUser.getAvatar()));
 	}
 
+	@Override
+	public SysUser queryUserInfo(Integer userId) {
+		SysUser sysUser = sysUserDao.get(userId);
+		sysUser.setOrganName(sysUserDao.getOrganName(sysUser.getOrganId()));
+		return sysUser;
+	}
+
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/TokenController.java

@@ -68,7 +68,7 @@ public class TokenController extends BaseController {
     public Object apiQueryUserInfo() {
 		AuthUser authUser = SecurityUtils.getUser();
 		if(authUser != null){
-			return succeed(userService.get(authUser.getUserId()));
+			return succeed(userService.queryUserInfo(authUser.getUserId()));
 		}
 		return failed("获取用户信息失败");
     }

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -183,4 +183,7 @@
     <select id="queryByStatus" resultMap="SysUser">
         select * from sys_user where lock_flag_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
     </select>
+    <select id="getOrganName" resultType="java.lang.String">
+        SELECT name_ FROM organization WHERE id_ = #{organId}
+    </select>
 </mapper>