Merge remote-tracking branch 'origin/master'

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/orgManager/RoleController.java

@@ -3,10 +3,10 @@ package com.zhongshu.card.server.core.controller.orgManager;
 import com.github.microservice.auth.client.constant.AuthConstant;
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
+import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.model.base.IDParam;
 import com.zhongshu.card.client.model.base.OidModel;
-import com.zhongshu.card.client.model.org.*;
-import com.github.microservice.net.ResultContent;
+import com.zhongshu.card.client.model.org.EditAuthParam;
 import com.zhongshu.card.client.model.org.role.RoleAddParam;
 import com.zhongshu.card.client.model.org.role.RoleModel;
 import com.zhongshu.card.client.model.org.role.RoleQueryParam;
@@ -120,7 +120,7 @@ public class RoleController {
         return roleService.getOrganizationAuth(oid, null);
     }
 
-    @Operation(summary = "得到用户项目的权限列表", description = "得到用户项目的权限列表")
+    @Operation(summary = "得到用户在项目的权限列表", description = "得到用户在项目的权限列表")
     @RequestMapping(value = "getCurrentUserProjectAuth", method = {RequestMethod.GET})
     @ResourceAuth(value = "user", type = AuthType.User)
     public ResultContent getCurrentUserProjectAuth(@Parameter(name = "projectOid", description = "当前选中的项目", example = "", required = false) @RequestParam("projectOid") String projectOid) {

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/org/OrganizationUser.java

@@ -93,6 +93,6 @@ public class OrganizationUser extends SuperMain {
     @DBRef(lazy = true)
     private Department department;
 
-    @Schema(description = "是否是结构类型")
+    @Schema(description = "是否是机构类型")
     private Boolean isOrg = Boolean.FALSE;
 }

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

@@ -355,6 +355,7 @@ public class OrganizationUserServiceImpl extends SuperService {
             _param.setUserAccount(userAccount);
             _param.setIsAdmin(Boolean.TRUE);
             _param.setRoleIds(adminRole.stream().map(it -> it.getId()).collect(Collectors.toList()));
+            _param.setProjectOid(organization.getOid());
             OrganizationUser temp = buildOrgUserInfo(_param);
             if (temp != null) {
                 newIds.add(temp.getId());
@@ -362,8 +363,9 @@ public class OrganizationUserServiceImpl extends SuperService {
         }
         if (ObjectUtils.isNotEmpty(oldList)) {
             List<OrganizationUser> _tempList = oldList.stream().filter(it -> {
-                return newIds.contains(it.getId());
+                return !newIds.contains(it.getId());
             }).collect(Collectors.toList());
+
             if (ObjectUtils.isNotEmpty(_tempList)) {
                 organizationUserDao.deleteAll(_tempList);
             }
@@ -430,12 +432,13 @@ public class OrganizationUserServiceImpl extends SuperService {
             organizationUser.setAuthType(organization.getAuthType());
 
             organizationUser.setProjectOid(param.getProjectOid());
-            if (ObjectUtils.isNotEmpty(param.getProjectOid())) {
+            if (ObjectUtils.isNotEmpty(roles)) {
                 roles = roles.stream().distinct().collect(Collectors.toUnmodifiableList());
             }
             organizationUser.setRoles(roles);
             organizationUserDao.save(organizationUser);
 
+            // 绑定角色
             roleServiceImpl.userBindRoles(organizationUser.getUserId(), roles);
         }
         return organizationUser;