更新！

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/UserCountSimpleModel.java

@@ -59,4 +59,13 @@ public class UserCountSimpleModel {
 
     @Schema(description = "用户状态")
     private UserState state = UserState.Normal;
+
+    private String stateStr;
+
+    public String getStateStr() {
+        if (state != null) {
+            return state.getRemark();
+        }
+        return "";
+    }
 }

FullCardClient/src/main/java/com/zhongshu/card/client/service/org/UserAccountService.java

@@ -1,9 +1,9 @@
 package com.zhongshu.card.client.service.org;
 
+import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.model.base.AuthTypeParam;
 import com.zhongshu.card.client.model.base.UserIdModel;
 import com.zhongshu.card.client.model.org.*;
-import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.model.org.orgUser.OrganizationUserModel;
 import com.zhongshu.card.client.model.org.orgUser.OrganizationUserSearch;
 import io.swagger.v3.oas.annotations.Operation;
@@ -66,8 +66,12 @@ public interface UserAccountService {
 
     ResultContent<UserCountDetailsModel> getCurrentDetailAndOrgs(AuthTypeParam param);
 
+    // 根据userId查询用户基本信息
     ResultContent<UserCountModel> getUserDetail(String userId);
 
+    // 根据loginName查询用户基本信息
+    ResultContent getUserDetailByLoginName(String loginName);
+
     // 得到当前用户在当前机构的信息
     ResultContent<OrganizationUserModel> getCurrentUserOrg();
 
@@ -79,5 +83,4 @@ public interface UserAccountService {
     );
 
 
-
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/user/UserInfoController.java

@@ -3,10 +3,10 @@ package com.zhongshu.card.server.core.controller.user;
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.helper.AuthHelper;
 import com.github.microservice.auth.security.type.AuthType;
+import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.model.base.AuthTypeParam;
 import com.zhongshu.card.client.model.base.UserIdModel;
 import com.zhongshu.card.client.model.org.*;
-import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.model.org.orgUser.OrganizationUserModel;
 import com.zhongshu.card.client.model.org.orgUser.OrganizationUserSearch;
 import com.zhongshu.card.client.service.org.OrganizationService;
@@ -93,7 +93,7 @@ public class UserInfoController {
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "修改用户头像", description = "修改用户头像")
     @RequestMapping(value = {"updateUserHead"}, method = {RequestMethod.GET})
-    public ResultContent<UserCountDetailsModel> updateUserHead(@Parameter(name = "url", description = "头像url", example = "")
+    public ResultContent updateUserHead(@Parameter(name = "url", description = "头像url", example = "")
     @RequestParam("url") String url) {
         return userAccountService.updateUserHead(url);
     }
@@ -156,6 +156,15 @@ public class UserInfoController {
         return organizationService.getUserOrgList(param);
     }
 
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "根据loginName查询用户基本信息", description = "根据loginName查询用户基本信息")
+    @RequestMapping(value = {"getUserDetailByLoginName"}, method = {RequestMethod.GET})
+    public ResultContent getUserDetailByLoginName(
+            @Parameter(name = "loginName", description = "登录名", example = "")
+            @RequestParam("loginName") String loginName) {
+        return userAccountService.getUserDetailByLoginName(loginName);
+    }
+
     //------------------------------------feign start -----------------------------
 
     @Operation(hidden = true, summary = "feign得到用户详情", description = "feign得到用户详情")

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/org/UserCountDao.java

@@ -27,4 +27,6 @@ public interface UserCountDao extends MongoDao<UserAccount>, UserCountDaoExtend
 
     long countByIsDeleteAndSex(Boolean isDeleted, Sex sex);
 
+    boolean existsByLoginName(String loginName);
+
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/user/UserAccountServiceImpl.java

@@ -210,6 +210,25 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
         return null;
     }
 
+    @Override
+    public ResultContent getUserDetailByLoginName(String loginName) {
+        UserAccount userAccount = userCountDao.findTopByLoginName(loginName);
+        return ResultContent.buildSuccess(toSimpleDesenModel(userAccount));
+    }
+
+    /**
+     * 判断用户是否存在
+     *
+     * @param loginName
+     * @return
+     */
+    public Boolean loginNameIsExist(String loginName) {
+        if (StringUtils.isEmpty(loginName)) {
+            return false;
+        }
+        return userCountDao.existsByLoginName(loginName);
+    }
+
     @Override
     public ResultContent<OrganizationUserModel> getOrgUserDetail(OrgUserDetailParam param) {
         String userId = param.getUserId();