chore: project detail join approve

2026-04-15 21:40:53 +08:00 · 2026-02-28 12:13:31 +08:00
parent 6163c3f08e
commit 8a4e981931
19 changed files with 449 additions and 72 deletions
--- a/packages/ui/certd-client/src/api/service.ts
+++ b/packages/ui/certd-client/src/api/service.ts
@@ -156,7 +156,7 @@ function createRequestFunction(service: any) {
    Object.assign(configDefault, config);

    if (projectStore.isEnterprise && !config.url.startsWith("/sys") && !config.url.startsWith("http")) {
-      configDefault.params.projectId = projectStore.currentProjectId;
+      configDefault.params.projectId = projectStore.currentProject?.id;
    }
    return service(configDefault);
  };
--- a/packages/ui/certd-client/src/components/project-selector/index.vue
+++ b/packages/ui/certd-client/src/components/project-selector/index.vue
@@ -8,6 +8,12 @@
            <fs-values-format :model-value="item.permission" :dict="projectPermissionDict"></fs-values-format>
          </div>
        </a-menu-item>
+        <a-menu-item key="join">
+          <div class="flex items-center w-full">
+            <fs-icon icon="ion:add" class="mr-1"></fs-icon>
+            <span>加入其他项目</span>
+          </div>
+        </a-menu-item>
      </a-menu>
    </template>
    <div class="rounded pl-3 pr-3 px-2 py-1 flex-center flex pointer items-center bg-accent h-10 button-text" title="当前项目">
@@ -22,6 +28,7 @@
 import { computed, onMounted } from "vue";
 import { useProjectStore } from "/@/store/project";
 import { useDicts } from "/@/views/certd/dicts";
+import { useRouter } from "vue-router";
 defineOptions({
  name: "ProjectSelector",
 });
@@ -32,7 +39,13 @@ onMounted(async () => {
  console.log(projectStore.myProjects);
 });

+const router = useRouter();
 function handleMenuClick({ key }: any) {
+  if (key === "join") {
+    router.push("/certd/project/join");
+    return;
+  }
+
  projectStore.changeCurrentProject(key);
  window.location.reload();
 }
--- a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
@@ -820,6 +820,7 @@ export default {
      write: "Write",
      admin: "Admin",
    },
+    projectMemberStatus: "Member Status",
  },
  project: {
    noProjectJoined: "You haven't joined any projects yet",
@@ -834,6 +835,8 @@ export default {
    leave: "Leave Project",
    leaveSuccess: "Leave project successful",
    leaveFailed: "Leave project failed, please try again later",
+    applyJoinConfirm: "Are you sure you want to apply to join this project?",
+    leaveConfirm: "Are you sure you want to leave this project?",
  },
  addonSelector: {
    select: "Select",
--- a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
@@ -836,6 +836,7 @@ export default {
      write: "写入",
      admin: "管理员",
    },
+    projectMemberStatus: "成员状态",
  },
  project: {
    noProjectJoined: "您还没有加入任何项目",
@@ -850,5 +851,7 @@ export default {
    leave: "退出项目",
    leaveSuccess: "退出项目成功",
    leaveFailed: "退出项目失败，请稍后重试",
+    applyJoinConfirm: "确认加入项目？",
+    leaveConfirm: "确认退出项目？",
  },
 };
--- a/packages/ui/certd-client/src/plugin/fast-crud/index.tsx
+++ b/packages/ui/certd-client/src/plugin/fast-crud/index.tsx
@@ -123,7 +123,6 @@ function install(app: App, options: any = {}) {
              if (scope.key === "__blank__") {
                return false;
              }
-
              //不能用 !scope.value ， 否则switch组件设置为关之后就消失了
              const { value, key, props } = scope;
              return !value && key != "_index" && value != false && value != 0;
--- a/packages/ui/certd-client/src/plugin/permission/use-crud-permission.ts
+++ b/packages/ui/certd-client/src/plugin/permission/use-crud-permission.ts
@@ -82,6 +82,7 @@ export function useCrudPermission({ permission }: UseCrudPermissionProps) {
    if (isProjectPermission) {
      removePermission = per.projectPermission || "write";
    }
+    debugger;
    return LodashMerge(
      {
        actionbar: {
@@ -94,6 +95,7 @@ export function useCrudPermission({ permission }: UseCrudPermissionProps) {
            edit: { show: hasActionPermission(editPermission) },
            remove: { show: hasActionPermission(removePermission) },
            view: { show: hasActionPermission(viewPermission) },
+            copy: { show: hasActionPermission(addPermission) },
          },
        },
      },
--- a/packages/ui/certd-client/src/router/source/modules/certd.ts
+++ b/packages/ui/certd-client/src/router/source/modules/certd.ts
@@ -25,8 +25,8 @@ export const certdResources = [
            const projectStore = useProjectStore();
            return projectStore.isEnterprise;
          },
+          isMenu: false,
          icon: "ion:apps",
-          permission: "sys:settings:edit",
          keepAlive: true,
        },
      },
@@ -36,10 +36,12 @@ export const certdResources = [
        path: "/certd/project/detail",
        component: "/certd/project/detail/index.vue",
        meta: {
-          isMenu: false,
-          show: true,
+          show: () => {
+            const projectStore = useProjectStore();
+            return projectStore.isEnterprise;
+          },
+          isMenu: true,
          icon: "ion:apps",
-          permission: "sys:settings:edit",
        },
      },
      {
--- a/packages/ui/certd-client/src/store/project/index.ts
+++ b/packages/ui/certd-client/src/store/project/index.ts
@@ -4,6 +4,7 @@ import { message } from "ant-design-vue";
 import { computed, ref } from "vue";
 import { useSettingStore } from "../settings";
 import { LocalStorage } from "/@/utils/util.storage";
+import { useUserStore } from "../user";

 export type ProjectItem = {
  id: string;
@@ -14,7 +15,9 @@ export type ProjectItem = {
 export const useProjectStore = defineStore("app.project", () => {
  const myProjects = ref([]);
  const inited = ref(false);
-  const lastProjectId = LocalStorage.get("currentProjectId");
+  const userStore = useUserStore();
+  const userId = userStore.getUserInfo?.id;
+  const lastProjectId = LocalStorage.get("currentProjectId:" + userId);
  const currentProjectId = ref(lastProjectId); // 直接调用

  const projects = computed(() => {
@@ -67,13 +70,11 @@ export const useProjectStore = defineStore("app.project", () => {
  }

  async function reload() {
-    debugger;
    inited.value = false;
    await init();
  }

  async function init() {
-    debugger;
    if (!inited.value) {
      await loadMyProjects();
      inited.value = true;
--- a/packages/ui/certd-client/src/views/certd/dicts.ts
+++ b/packages/ui/certd-client/src/views/certd/dicts.ts
@@ -1,5 +1,6 @@
 import { dict } from "@fast-crud/fast-crud";
 import { GetMyProjectList } from "./project/api";
+import { request } from "/@/api/service";

 const projectPermissionDict = dict({
  data: [
@@ -65,8 +66,16 @@ const myProjectDict = dict({
 });

 const userDict = dict({
-  url: "/sys/authority/user/getSimpleUsers",
+  url: "/basic/user/getSimpleUsers",
  value: "id",
+  getData: async () => {
+    const res = await request({
+      url: "/basic/user/getSimpleUsers",
+      method: "POST",
+    });
+    return res;
+  },
+  immediate: false,
  onReady: ({ dict }) => {
    for (const item of dict.data) {
      item.label = item.nickName || item.username || item.phoneCode + item.mobile;
--- a/packages/ui/certd-client/src/views/certd/project/detail/api.ts
+++ b/packages/ui/certd-client/src/views/certd/project/detail/api.ts
@@ -1,6 +1,6 @@
 import { request } from "/src/api/service";

-const apiPrefix = "/enterprise/myProjectMember";
+const apiPrefix = "/enterprise/projectMember";
 const userApiPrefix = "/sys/authority/user";
 export async function GetList(query: any) {
  return await request({
@@ -65,3 +65,13 @@ export async function GetUserSimpleByIds(query: any) {
    data: query,
  });
 }
+
+export async function ApproveJoin(id: any) {
+  return await request({
+    url: "/enterprise/project/approveJoin",
+    method: "post",
+    data: {
+      id,
+    },
+  });
+}
--- a/packages/ui/certd-client/src/views/certd/project/detail/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/project/detail/crud.tsx
@@ -7,6 +7,7 @@ import { useSettingStore } from "/@/store/settings";
 import { useUserStore } from "/@/store/user";
 import { useI18n } from "/src/locales";
 import { useDicts } from "../../dicts";
+import { useApprove } from "./use";

 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
  const router = useRouter();
@@ -34,8 +35,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
  const settingStore = useSettingStore();
  const selectedRowKeys: Ref<any[]> = ref([]);
  context.selectedRowKeys = selectedRowKeys;
-
-  const { userDict } = useDicts();
+  const { hasActionPermission } = context;
+  const { userDict, projectMemberStatusDict, projectPermissionDict } = useDicts();
+  const { openApproveDialog } = useApprove();

  return {
    crudOptions: {
@@ -118,13 +120,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
        permission: {
          title: t("certd.ent.projectPermission"),
          type: "dict-select",
-          dict: dict({
-            data: [
-              { label: t("certd.ent.permission.read"), value: "read", color: "cyan" },
-              { label: t("certd.ent.permission.write"), value: "write", color: "blue" },
-              { label: t("certd.ent.permission.admin"), value: "admin", color: "green" },
-            ],
-          }),
+          dict: projectPermissionDict,
          search: {
            show: true,
          },
@@ -135,6 +131,50 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
            width: 200,
          },
        },
+        status: {
+          title: t("certd.ent.projectMemberStatus"),
+          type: "dict-select",
+          dict: projectMemberStatusDict,
+          search: {
+            show: true,
+          },
+          form: {
+            show: true,
+          },
+          column: {
+            width: 200,
+            cellRender: ({ row }) => {
+              let approveButton: any = "";
+              if (row.status === "pending" && hasActionPermission("admin")) {
+                approveButton = (
+                  <fs-button
+                    class="ml-2"
+                    type="primary"
+                    size="small"
+                    onClick={async () => {
+                      openApproveDialog({
+                        id: row.id,
+                        permission: row.permission,
+                        onSubmit: async (form: any) => {
+                          await api.ApproveJoin(form);
+                          crudExpose.doRefresh();
+                        },
+                      });
+                    }}
+                  >
+                    审批
+                  </fs-button>
+                );
+              }
+              return (
+                <div class="flex items-center">
+                  <fs-values-format model-value={row.status} dict={projectMemberStatusDict}></fs-values-format>
+                  {approveButton}
+                </div>
+              );
+            },
+          },
+        },
        createTime: {
          title: t("certd.createTime"),
          type: "datetime",
--- a/packages/ui/certd-client/src/views/certd/project/detail/index.vue
+++ b/packages/ui/certd-client/src/views/certd/project/detail/index.vue
@@ -3,8 +3,14 @@
    <template #header>
      <div class="title">
        {{ t("certd.ent.projectDetailManager") }}
-        <span class="sub">
-          {{ t("certd.ent.projectDetailDescription") }}
+        <span class="sub flex-inline items-center">
+          项目名称 ：<a-tag color="green">{{ project?.name }}</a-tag>
+          <a-divider type="vertical"></a-divider>
+          管理员：<fs-values-format :model-value="project.adminId" :dict="userDict" color="green"></fs-values-format>
+          <!-- <a-divider type="vertical"></a-divider>
+          <fs-values-format :model-value="project.permission" :dict="projectPermissionDict"></fs-values-format>
+          <a-divider type="vertical"></a-divider>
+          <fs-values-format :model-value="project.status" :dict="projectMemberStatusDict"></fs-values-format> -->
        </span>
      </div>
    </template>
@@ -19,13 +25,17 @@
 </template>

 <script lang="ts" setup>
-import { onActivated, onMounted } from "vue";
+import { onActivated, onMounted, Ref, ref } from "vue";
 import { useFs } from "@fast-crud/fast-crud";
 import createCrudOptions from "./crud";
 import { message, Modal } from "ant-design-vue";
 import { DeleteBatch } from "./api";
 import { useI18n } from "/src/locales";
 import { useRoute } from "vue-router";
+import { useProjectStore } from "/@/store/project";
+import { request } from "/@/api/service";
+import { useDicts } from "../../dicts";
+import { useCrudPermission } from "/@/plugin/permission";

 const { t } = useI18n();

@@ -35,11 +45,38 @@ defineOptions({

 const route = useRoute();
 const projectIdStr = route.query.projectId as string;
-const projectId = Number(projectIdStr);
+let projectId = Number(projectIdStr);
+const projectStore = useProjectStore();
+if (!projectId) {
+  projectId = projectStore.currentProject?.id;
+}
+
+const { projectPermissionDict, projectMemberStatusDict, userDict } = useDicts();
+
+const project: Ref<any> = ref({});
+
+async function loadProjectDetail() {
+  if (projectId) {
+    const res = await request({
+      url: `/enterprise/project/detail`,
+      method: "post",
+      params: {
+        projectId,
+      },
+    });
+    project.value = res;
+  }
+}

 const context: any = {
  projectId,
+  permission: {
+    isProjectPermission: true,
+    projectPermission: "admin",
+  },
 };
+const { hasActionPermission } = useCrudPermission(context);
+context.hasActionPermission = hasActionPermission;
 const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context });

 const selectedRowKeys = context.selectedRowKeys;
@@ -61,7 +98,8 @@ const handleBatchDelete = () => {
 };

 // 页面打开后获取列表数据
-onMounted(() => {
+onMounted(async () => {
+  await loadProjectDetail();
  crudExpose.doRefresh();
 });
 onActivated(async () => {
--- a/packages/ui/certd-client/src/views/certd/project/detail/use.ts
+++ b/packages/ui/certd-client/src/views/certd/project/detail/use.ts
@@ -0,0 +1,46 @@
+import { dict } from "@fast-crud/fast-crud";
+import { useDicts } from "../../dicts";
+import { useFormDialog } from "/@/use/use-dialog";
+
+export function useApprove() {
+  const { openFormDialog } = useFormDialog();
+  const { projectPermissionDict, projectMemberStatusDict, userDict } = useDicts();
+  function openApproveDialog({ id, permission, onSubmit }: { id: any; permission: any; onSubmit: any }) {
+    openFormDialog({
+      title: "审批加入申请",
+      columns: {
+        permission: {
+          title: "成员权限",
+          type: "dict-select",
+          dict: projectPermissionDict,
+        },
+        status: {
+          title: "审批结果",
+          type: "dict-radio",
+          dict: dict({
+            data: [
+              {
+                label: "通过",
+                value: "approved",
+              },
+              {
+                label: "拒绝",
+                value: "rejected",
+              },
+            ],
+          }),
+        },
+      },
+      onSubmit: onSubmit,
+      initialForm: {
+        id: id,
+        permission: permission,
+        status: "approved",
+      },
+    });
+  }
+
+  return {
+    openApproveDialog,
+  };
+}
--- a/packages/ui/certd-client/src/views/certd/project/join.vue
+++ b/packages/ui/certd-client/src/views/certd/project/join.vue
@@ -16,19 +16,22 @@
                <h3 class="text-md font-bold title">{{ project.name }}</h3>
                <p class="text-gray-500 text-sm">{{ formatDate(project.createTime) }}</p>
              </div>
-              <div class="flex justify-between items-center">
-                <div v-if="project.status">
-                  <fs-values-format :model-value="project.status" :dict="projectMemberStatusDict"></fs-values-format>
+              <div class="flex-col items-center">
+                <div>管理员： <fs-values-format :model-value="project.adminId" :dict="userDict"></fs-values-format></div>
+                <div class="flex items-center mt-2">
+                  <div v-if="project.status">
+                    <fs-values-format :model-value="project.status" :dict="projectMemberStatusDict"></fs-values-format>
+                  </div>
+                  <div v-if="project.permission"><fs-values-format :model-value="project.permission" :dict="projectPermissionDict"></fs-values-format></div>
                </div>
-                <div v-if="project.permission"><fs-values-format :model-value="project.permission" :dict="projectPermissionDict"></fs-values-format></div>
              </div>
            </div>
            <template #actions>
-              <span v-if="!project.status || project.status === 'rejected'" class="flex-inline items-center" :title="t('certd.project.applyJoin')" @click="applyToJoin(project.id)">
+              <span v-if="!project.status || project.status === 'rejected'" class="flex-inline items-center text-blue-500" :title="t('certd.project.applyJoin')" @click="applyToJoin(project.id)">
                <fs-icon class="fs-18 mr-2" icon="mdi:checkbox-marked-circle-outline"></fs-icon>
                {{ t("certd.project.applyJoin") }}
              </span>
-              <span v-if="project.status === 'pending' || project.status === 'approved'" class="flex-inline items-center" :title="t('certd.project.leave')" @click="leaveProject(project.id)">
+              <span v-if="project.status === 'pending' || project.status === 'approved'" class="flex-inline items-center text-red-500" :title="t('certd.project.leave')" @click="leaveProject(project.id)">
                <fs-icon class="fs-18 mr-2" icon="mdi:arrow-right-thin-circle-outline"></fs-icon>
                {{ t("certd.project.leave") }}
              </span>
@@ -48,14 +51,13 @@ import { request } from "/src/api/service";
 import { useProjectStore } from "/@/store/project";
 import dayjs from "dayjs";
 import { useDicts } from "../dicts";
-import { modalProps } from "ant-design-vue/es/modal/Modal";

 defineOptions({
  name: "ProjectJoin",
 });
 const { t } = useI18n();

-const { projectMemberStatusDict, projectPermissionDict } = useDicts();
+const { projectMemberStatusDict, projectPermissionDict, userDict } = useDicts();

 const projects = ref<any[]>([]);

--- a/packages/ui/certd-server/src/controller/user/basic/user-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/basic/user-controller.ts
@@ -0,0 +1,60 @@
+import { Constants, isEnterprise } from '@certd/lib-server';
+import { Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
+import { In } from 'typeorm';
+import { AuthService } from '../../../modules/sys/authority/service/auth-service.js';
+import { UserService } from '../../../modules/sys/authority/service/user-service.js';
+import { BasicController } from '../../basic/code-controller.js';
+
+/**
+ * 通知
+ */
+@Provide()
+@Controller('/api/basic/user')
+export class BasicUserController extends BasicController {
+  @Inject()
+  service: UserService;
+  @Inject()
+  authService: AuthService;
+
+  getService(): UserService {
+    return this.service;
+  }
+
+  @Post('/getSimpleUserByIds', { summary: Constants.per.authOnly })
+  async getSimpleUserByIds(@Body('ids') ids: number[]) {
+    if(!isEnterprise()){
+       throw new Error('非企业模式不能获取用户信息');
+    }
+    const users = await this.service.find({
+      select: {
+        id: true,
+        username: true,
+        nickName: true,
+        mobile: true,
+        phoneCode: true,
+      },
+      where: {
+        id: In(ids),
+      },
+    });
+    return this.ok(users);
+  }
+
+  @Post('/getSimpleUsers', {summary: Constants.per.authOnly})
+  async getSimpleUsers() {
+    if(!isEnterprise()){
+       throw new Error('非企业模式不能获取所有用户信息');
+    }
+    const users = await this.service.find({
+      select: {
+        id: true,
+        username: true,
+        nickName: true,
+        mobile: true,
+        phoneCode: true,
+      },
+    });
+    return this.ok(users);
+  }
+
+}
--- a/packages/ui/certd-server/src/controller/user/enterprise/project-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/enterprise/project-controller.ts
@@ -22,6 +22,18 @@ export class UserProjectController extends BaseController {
    return this.service;
  }

+   /**
+   * @param body 
+   * @returns 
+   */
+  @Post('/detail', { summary: Constants.per.authOnly })
+  async detail(@Body(ALL) body: any) {
+    const {projectId} = await this.getProjectUserIdRead();
+    const res = await this.service.getDetail(projectId,this.getUserId());
+    return this.ok(res);
+  }
+
+
  /**
   * 我的项目
   * @param body 
--- a/packages/ui/certd-server/src/controller/user/enterprise/project-member-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/enterprise/project-member-controller.ts
@@ -0,0 +1,115 @@
+import { CrudController, SysSettingsService,Constants } from "@certd/lib-server";
+import { ALL, Body, Controller, Inject, Post, Provide, Query } from "@midwayjs/core";
+import { ProjectMemberEntity } from "../../../modules/sys/enterprise/entity/project-member.js";
+import { ProjectMemberService } from "../../../modules/sys/enterprise/service/project-member-service.js";
+import { merge } from "lodash-es";
+import { ProjectService } from "../../../modules/sys/enterprise/service/project-service.js";
+/**
+ */
+@Provide()
+@Controller("/api/enterprise/projectMember")
+export class ProjectMemberController extends CrudController<ProjectMemberEntity> {
+  @Inject()
+  service: ProjectMemberService;
+
+  @Inject()
+  sysSettingsService: SysSettingsService;
+
+  @Inject()
+  projectService: ProjectService;
+
+  getService<T>() {
+    return this.service;
+  }
+
+  @Post("/page", { summary: Constants.per.authOnly })
+  async page(@Body(ALL) body: any) {
+    const {projectId} = await this.getProjectUserIdRead();
+    body.query = body.query ?? {};
+    body.query.projectId = projectId;
+    return await super.page(body);
+  }
+
+  @Post("/list", { summary: Constants.per.authOnly })
+  async list(@Body(ALL) body: any) {
+    const {projectId} = await this.getProjectUserIdRead();
+    body.query = body.query ?? {};
+    body.query.projectId = projectId;
+    return super.list(body);
+  }
+
+  @Post("/add", { summary: Constants.per.authOnly })
+  async add(@Body(ALL) bean: any) {
+    const def: any = {
+      isDefault: false,
+      disabled: false,
+    };
+    merge(bean, def);
+
+    await this.projectService.checkAdminPermission({
+      userId: this.getUserId(),
+      projectId: bean.projectId,
+    });
+
+    return super.add(bean);
+  }
+
+  @Post("/update", { summary: Constants.per.authOnly }) 
+  async update(@Body(ALL) bean: any) {
+    if (!bean.id) {
+      throw new Error("id is required");
+    }
+    const projectId = await this.service.getProjectId(bean.id)
+    await this.projectService.checkAdminPermission({
+      userId: this.getUserId(),
+      projectId: projectId,
+    });
+    return super.update({
+      id: bean.id,
+      permission: bean.permission,
+    });
+  }
+
+  @Post("/info", { summary: Constants.per.authOnly })
+  async info(@Query("id") id: number) {
+     if (!id) {
+      throw new Error("id is required");
+    }
+    const projectId = await this.service.getProjectId(id)
+    await this.projectService.checkReadPermission({
+      userId: this.getUserId(),
+      projectId:projectId,
+    });
+    return super.info(id);
+  }
+
+  @Post("/delete", { summary: Constants.per.authOnly })
+  async delete(@Query("id") id: number) {
+    if (!id) {
+      throw new Error("id is required");
+    }
+    const projectId = await this.service.getProjectId(id)
+    await this.projectService.checkAdminPermission({
+      userId: this.getUserId(),
+      projectId:projectId,
+    });
+    return super.delete(id);
+  }
+
+  @Post("/deleteByIds", { summary: Constants.per.authOnly })
+  async deleteByIds(@Body("ids") ids: number[]) {
+    for (const id of ids) {
+      if (!id) {
+        throw new Error("id is required");
+      }
+      const projectId = await this.service.getProjectId(id)
+      await this.projectService.checkAdminPermission({
+        userId: this.getUserId(),
+        projectId:projectId,
+      });
+      await this.service.delete(id as any);
+    }
+   
+    return this.ok({});
+  }
+}
--- a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-member-service.ts
+++ b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-member-service.ts
@@ -47,11 +47,12 @@ export class ProjectMemberService extends BaseService<ProjectMemberEntity> {
    });
  }

-  async getMember(projectId: number,userId: number) {
+  async getMember(projectId: number,userId: number,status?:string) {
    return await this.repository.findOne({
      where: {
        userId,
        projectId,
+        status,
      },
    });
  }
--- a/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
+++ b/packages/ui/certd-server/src/modules/sys/enterprise/service/project-service.ts
@@ -43,13 +43,13 @@ export class ProjectService extends BaseService<ProjectEntity> {
      throw new Error('项目名称已存在');
    }
    bean.disabled = false
-    const res= await super.add(bean)
+    const res = await super.add(bean)
    projectCache.clear();
    return res;
  }

-  async update( bean: ProjectEntity) {
-    const res= await super.update(bean)
+  async update(bean: ProjectEntity) {
+    const res = await super.update(bean)
    projectCache.clear();
    return res;
  }
@@ -65,7 +65,7 @@ export class ProjectService extends BaseService<ProjectEntity> {

  async getUserProjects(userId: number) {

-    const memberList = await this.projectMemberService.getByUserId(userId,'approved');
+    const memberList = await this.projectMemberService.getByUserId(userId, 'approved');
    const projectIds = memberList.map(item => item.projectId);
    const projectList = await this.repository.createQueryBuilder('project')
      .where(' project.disabled = false')
@@ -89,15 +89,15 @@ export class ProjectService extends BaseService<ProjectEntity> {
    return projectList
  }

-  async getAllWithStatus(userId: number) : Promise<ProjectMemberItem[]> {
-    let projectList:any = await this.find({
+  async getAllWithStatus(userId: number): Promise<ProjectMemberItem[]> {
+    let projectList: any = await this.find({
      where: {
        disabled: false,
        userId: 0,
      },
-    }) 
-    const  projectMemberItemList:ProjectMemberItem[] = projectList
-   
+    })
+    const projectMemberItemList: ProjectMemberItem[] = projectList
+
    const memberList = await this.projectMemberService.getByUserId(userId);

    const memberMap = memberList.reduce((prev, cur) => {
@@ -111,7 +111,7 @@ export class ProjectService extends BaseService<ProjectEntity> {
        item.status = 'approved';
        item.memberId = userId
      } else {
-        const memberItem :any = memberMap[item.id]
+        const memberItem: any = memberMap[item.id]
        if (memberItem) {
          item.permission = memberItem.permission;
          item.status = memberItem.status;
@@ -122,6 +122,27 @@ export class ProjectService extends BaseService<ProjectEntity> {
    return projectMemberItemList
  }

+
+  async getDetail(projectId: number, userId?: number): Promise<ProjectMemberItem[]> {
+    const project: any = await this.info(projectId);
+    if (!project) {
+      throw new Error('项目不存在');
+    }
+    if (project.adminId === userId) {
+      project.permission = 'admin';
+      project.status = 'approved';
+      project.memberId = userId
+    } else {
+      const member = await this.projectMemberService.getMember(projectId, userId);
+      if (member) {
+        project.permission = member.permission;
+        project.status = member.status;
+        project.memberId = member.userId
+      }
+    }
+    return project
+  }
+
  async checkAdminPermission({ userId, projectId }: { userId: number, projectId: number }) {
    return await this.checkPermission({
      userId,
@@ -157,36 +178,36 @@ export class ProjectService extends BaseService<ProjectEntity> {

    const cacheKey = `projectPermission:${projectId}:${userId}`
    let savedPermission = projectCache.get(cacheKey);
-    
-    if (!savedPermission){
-        const project = await this.findOne({
-          select: ['id', 'userId', 'adminId', 'disabled'],
-          where: {
-            id: projectId,
-          },
-        });
-        if (!project) {
-          throw new Error('项目不存在');
+
+    if (!savedPermission) {
+      const project = await this.findOne({
+        select: ['id', 'userId', 'adminId', 'disabled'],
+        where: {
+          id: projectId,
+        },
+      });
+      if (!project) {
+        throw new Error('项目不存在');
+      }
+      if (project.adminId === userId) {
+        //创建者拥有管理权限
+        savedPermission = 'admin';
+      } else {
+        if (project.disabled) {
+          throw new Error('项目已禁用');
        }
-        if (project.adminId === userId) {
-          //创建者拥有管理权限
-          savedPermission = 'admin';
-        }else{
-          if (project.disabled) {
-            throw new Error('项目已禁用');
-          } 
-          const member = await this.projectMemberService.getMember(projectId, userId);
-          if (!member || member.status !== 'approved') {
-            throw new Error(`用户${userId}还不是项目${projectId}的成员`);
-          }
-          savedPermission = member.permission;
+        const member = await this.projectMemberService.getMember(projectId, userId);
+        if (!member || member.status !== 'approved') {
+          throw new Error(`用户${userId}还不是项目${projectId}的成员`);
        }
+        savedPermission = member.permission;
+      }
    }
-    projectCache.set(cacheKey, savedPermission,{ttl:  3 * 60 * 1000});
+    projectCache.set(cacheKey, savedPermission, { ttl: 3 * 60 * 1000 });
    if (!savedPermission) {
      throw new Error(`权限不足，需要${permission}权限`);
    }
-    
+
    if (permission === 'read') {
      return true
    }
@@ -219,12 +240,12 @@ export class ProjectService extends BaseService<ProjectEntity> {
    if (member && member.status === 'approved') {
      throw new Error('用户已加入项目');
    }
-    if (member){
+    if (member) {
      this.projectMemberService.update({
        id: member.id,
        status: 'pending',
      })
-    }else{
+    } else {
      // 加入项目
      await this.projectMemberService.add({
        userId,
@@ -235,12 +256,12 @@ export class ProjectService extends BaseService<ProjectEntity> {
    }
  }

-  async approveJoin({ userId, projectId,status,permission }: { userId: number, projectId: number,status:string,permission:string }) {
+  async approveJoin({ userId, projectId, status, permission }: { userId: number, projectId: number, status: string, permission: string }) {
    const member = await this.projectMemberService.getMember(projectId, userId);
    if (!member) {
      throw new Error('找不到用户的申请记录');
    }
- 
+
    await this.projectMemberService.update({
      id: member.id,
      status: status,