机构类型

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

@@ -54,6 +54,9 @@ public interface UserAccountService {
 
     ResultContent<UserCountModel> getUserDetail(String userId);
 
+    // 得到当前用户在当前机构的信息
+    ResultContent<OrganizationUserModel> getCurrentUserOrg();
+
     @Operation(summary = "分页查询所有用户", description = "分页查询用户")
     @RequestMapping(value = "list", consumes = {MediaType.ALL_VALUE}, method = RequestMethod.POST)
     ResultContent<Page<UserCountModel>> list(

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/IndexController.java

@@ -104,7 +104,7 @@ public class IndexController {
         Assert.hasText(param.getOid(), "oid不能为空");
         ResultContent result = indexService.loginToOid(param);
         if (result.isSuccess()) {
-            LoginTokenModel tokenModel = (LoginTokenModel) result.getContent();
+            LoginPlatformTokenModel tokenModel = (LoginPlatformTokenModel) result.getContent();
             response.setHeader("accessToken", tokenModel.getAccess_token());
             Cookie cookie = new Cookie("accessToken", tokenModel.getAccess_token());
             cookie.setMaxAge(60 * 60 * 24 * 3);

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

@@ -47,6 +47,13 @@ public class UserInfoController {
         return userAccountService.getCurrentDetail(param);
     }
 
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "得到当前用户在当前机构的信息", description = "得到当前用户在当前机构的信息")
+    @RequestMapping(value = {"getCurrentUserOrg"}, method = {RequestMethod.GET})
+    public ResultContent<OrganizationUserModel> getCurrentUserOrg() {
+        return userAccountService.getCurrentUserOrg();
+    }
+
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "得到当前用户信息+所有指定的机构数据", description = "得到当前用户信息 + 所有指定的机构数据")
     @RequestMapping(value = {"getCurrentDetailAndOrgs"}, method = {RequestMethod.POST})

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/IndexService.java

@@ -152,7 +152,7 @@ public class IndexService {
         String phone = param.getLoginValue();
         UserAuthLoginModel userAuthLoginModel = new UserAuthLoginModel();
         BeanUtils.copyProperties(param, userAuthLoginModel);
-        ResultContent resultContent = commonLogin(userAuthLoginModel);
+        ResultContent<LoginTokenModel> resultContent = commonLogin(userAuthLoginModel);
         if (resultContent.isFailed()) {
             return resultContent;
         }
@@ -174,31 +174,14 @@ public class IndexService {
             }
             return ResultContent.buildFail(msg);
         }
+        LoginTokenModel loginTokenModel = resultContent.getContent();
+        LoginPlatformTokenModel tokenModel = new LoginPlatformTokenModel();
+        com.zhongshu.card.server.core.util.BeanUtils.copyProperties(loginTokenModel, tokenModel);
+        tokenModel.setPlatformOid(organization.getOid());
+        OrganizationUserModel userModel = userAccountService.toOrgUserModel(organizationUser);
+        tokenModel.setUserInfo(userModel);
 
-//        if (param.getLoginFromType() == LoginFromType.Platform) {
-//            // web平台端登录
-//            // 判断用户是否加入了平台端
-//            Organization platformOrg = organizationDao.findTopByAuthType(AuthType.Platform);
-//            if (ObjectUtils.isEmpty(platformOrg)) {
-//                return ResultContent.buildFail("平台端数据未初始化，登录失败");
-//            }
-//            long number = organizationUserDao.countByUserAndStateAndAuthType(userAccount, UserState.Normal, AuthType.Platform);
-//            if (number <= 0) {
-//                return ResultContent.buildFail(String.format("用户不属于平台端用户，登录失败：%s", phone));
-//            }
-//        } else if (param.getLoginFromType() == LoginFromType.School) {
-//            // 校园端web登录
-//            long number = organizationUserDao.countByUserAndStateAndAuthType(userAccount, UserState.Normal, AuthType.School);
-//            if (number <= 0) {
-//                return ResultContent.buildFail(String.format("用户未加入学校，登录失败：%s", phone));
-//            }
-//        } else if (param.getLoginFromType() == LoginFromType.Shop) {
-//            long number = organizationUserDao.countByUserAndStateAndAuthType(userAccount, UserState.Normal, AuthType.BusinessMain);
-//            if (number <= 0) {
-//                return ResultContent.buildFail(String.format("用户不属于任何商户，登录失败：%s", phone));
-//            }
-//        }
-        return resultContent;
+        return ResultContent.buildSuccess(tokenModel);
     }
 
     public ResultContent<LoginTokenModel> commonLogin(UserAuthLoginModel userAuthLoginModel) {

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

@@ -539,7 +539,7 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
     }
 
     /**
-     * 得到用户信息
+     * 得到用户信息 (基本信息)
      *
      * @param userId
      * @return
@@ -553,6 +553,19 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
         return ResultContent.buildSuccess(model);
     }
 
+    /**
+     * 得到当前用户在当前机构的信息
+     *
+     * @return
+     */
+    @Override
+    public ResultContent<OrganizationUserModel> getCurrentUserOrg() {
+        OrgUserDetailParam param = new OrgUserDetailParam();
+        param.setUserId(getCurrentUserId());
+        param.setOid(getCurrentOid());
+        return getOrgUserDetail(param);
+    }
+
     /**
      * 分页查询所有用户
      *

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/school/SchoolUserServiceImpl.java

@@ -340,6 +340,10 @@ public class SchoolUserServiceImpl extends SuperService implements SchoolUserSer
         return ResultContent.buildSuccess(cardInfos);
     }
 
+    /**
+     * 得到当前用户子啊机构的所有卡片
+     * @return
+     */
     @Override
     public ResultContent<List<CardInfoModel>> getCurrentUserOrgAll() {
         String userId = getCurrentUserId();