|
|
@@ -16,6 +16,7 @@ import com.zhongshu.card.client.model.orgModel.OrgBindUserAllParam;
|
|
|
import com.zhongshu.card.client.model.school.ImportResultModel;
|
|
|
import com.zhongshu.card.client.service.org.UserAccountService;
|
|
|
import com.zhongshu.card.client.type.user.OrgAddType;
|
|
|
+import com.zhongshu.card.client.type.user.OrgUserState;
|
|
|
import com.zhongshu.card.server.core.service.org.OrganizationUserServiceImpl;
|
|
|
import io.swagger.v3.oas.annotations.Operation;
|
|
|
import io.swagger.v3.oas.annotations.Parameter;
|
|
|
@@ -78,7 +79,9 @@ public class OrganizationUserController {
|
|
|
Assert.hasText(param.getProjectOid(), "projectOid不能为空");
|
|
|
// 项目用户 包括项目下所有的机构的用户
|
|
|
param.setIsSearchProject(Boolean.TRUE);
|
|
|
- param.setIsOrg(Boolean.TRUE);
|
|
|
+ // param.setIsOrg(Boolean.TRUE);
|
|
|
+ param.setAddType(null);
|
|
|
+ param.setOrgUserState(OrgUserState.Formal);
|
|
|
return userAccountService.projectUserPage(param, pageable);
|
|
|
}
|
|
|
|