@pubinfo-pr/module-rbac 0.223.1 → 0.224.2

package/src/api/modules/rbac/jiaosejiekou.ts

@@ -18,6 +18,24 @@ export function postRbacRoleAddRole<
   });
 }
 
+/**
+ * @description 获得拥有多个角色的用户编号集合
+ * @url /rbac/role/getUserRoleIdListByRoleIds
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postRbacRoleGetUserRoleIdListByRoleIds<
+  R = API.ResponseDataPubUserRoleBo,
+  T = API.ResponseDataPubUserRoleBo,
+>(body: string[], options?: Parameters<typeof request.Post<R, T>>[2]) {
+  return request.Post<R, T>('/rbac/role/getUserRoleIdListByRoleIds', body, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    ...(options || {}),
+  });
+}
+
 /**
  * @description 根据id查询
  * @url /rbac/role/info
@@ -137,3 +155,21 @@ export function postRbacRoleRoleUserPage<
     ...(options || {}),
   });
 }
+
+/**
+ * @description 校验角色们是否有效
+ * @url /rbac/role/validRoleList
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postRbacRoleValidRoleList<
+  R = API.ResponseDataVoid,
+  T = API.ResponseDataVoid,
+>(body: string[], options?: Parameters<typeof request.Post<R, T>>[2]) {
+  return request.Post<R, T>('/rbac/role/validRoleList', body, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    ...(options || {}),
+  });
+}

package/src/api/modules/rbac/typings.d.ts

@@ -332,6 +332,20 @@ declare namespace API {
   type postRbacResourceMineOrAllResourceTreeParams = {
     needAll?: boolean;
     enable?: boolean;
+    appResourceCodes?: string;
+  };
+
+  type postRbacUserCaptchaChangePasswordWithVerifyCodeParams = {
+    /** 原密码(使用公钥加密) */
+    oldPassword: string;
+    /** 新密码(使用公钥加密) */
+    newPassword: string;
+    /** 验证码hash,imageCode必填 */
+    codeHash: string;
+    /** 验证码/token */
+    code: string;
+    /** 验证码类型 */
+    captchaType: string;
   };
 
   type postRbacUserChangePasswordParams = {
@@ -352,6 +366,10 @@ declare namespace API {
     code: string;
   };
 
+  type postRbacUserGetUserParams = {
+    id: string;
+  };
+
   type postRbacUserResetPasswordParams = {
     /** 用户id */
     userId: string;
@@ -433,6 +451,12 @@ declare namespace API {
     collect?: boolean;
     /** 租户id */
     tenantId?: string;
+    /** 组织负责人id */
+    leaderUserId?: string;
+    /** 组织负责人的orgId */
+    leaderUserOrgId?: string;
+    /** 组织负责人姓名 */
+    leaderUserName?: string;
   };
 
   type PubOrgAddDto = {
@@ -460,6 +484,12 @@ declare namespace API {
     contactMobile?: string;
     /** 扩展信息 */
     extendInfo?: Record<string, any>;
+    /** 组织负责人id */
+    leaderUserId?: string;
+    /** 组织负责人的orgId */
+    leaderUserOrgId?: string;
+    /** 组织负责人姓名 */
+    leaderUserName?: string;
   };
 
   type PubOrgBo = {
@@ -515,6 +545,12 @@ declare namespace API {
     collect?: boolean;
     /** 租户id */
     tenantId?: string;
+    /** 组织负责人id */
+    leaderUserId?: string;
+    /** 组织负责人的orgId */
+    leaderUserOrgId?: string;
+    /** 组织负责人姓名 */
+    leaderUserName?: string;
     /** 父组织名称 */
     parentName?: string;
     /** 是否继承，0：否，1：是 */
@@ -608,6 +644,12 @@ declare namespace API {
     collect?: boolean;
     /** 租户id */
     tenantId?: string;
+    /** 组织负责人id */
+    leaderUserId?: string;
+    /** 组织负责人的orgId */
+    leaderUserOrgId?: string;
+    /** 组织负责人姓名 */
+    leaderUserName?: string;
     /** 子节点 */
     children?: PubOrgTreeBo[];
   };
@@ -637,6 +679,12 @@ declare namespace API {
     contactMobile?: string;
     /** 扩展信息 */
     extendInfo?: Record<string, any>;
+    /** 组织负责人id */
+    leaderUserId?: string;
+    /** 组织负责人的orgId */
+    leaderUserOrgId?: string;
+    /** 组织负责人姓名 */
+    leaderUserName?: string;
   };
 
   type PubPost = {
@@ -801,6 +849,13 @@ declare namespace API {
     md5?: string;
   };
 
+  type PubResourceReSortUpdateDTO = {
+    /** 资源id */
+    id?: string;
+    /** 子资源列表 */
+    children?: PubResourceReSortUpdateDTO[];
+  };
+
   type PubResourceTreeBo = {
     /** 主键 */
     id?: string;
@@ -1215,6 +1270,53 @@ declare namespace API {
     createTime?: string;
   };
 
+  type PubUser = {
+    /** 主键 */
+    id?: string;
+    /** 所属组织，当前为组织 */
+    orgId?: string;
+    /** 登录账号 */
+    loginName?: string;
+    /** 登录密码 */
+    loginPassword?: string;
+    /** 真实姓名 */
+    realName?: string;
+    /** 性别 0:未知,1：男，2:女 */
+    sex?: string;
+    /** 昵称 */
+    nickName?: string;
+    /** 手机号 */
+    mobile?: string;
+    /** 联系地址 */
+    address?: string;
+    /** 身份证号码 */
+    idCard?: string;
+    /** 用户头像 */
+    userPic?: string;
+    /** 电子邮箱 */
+    email?: string;
+    /** 描述 */
+    description?: string;
+    /** 是否启用，0：否，1：是 */
+    enable?: boolean;
+    /** 是否删除，0：否，1：是 */
+    deleted?: boolean;
+    /** 创建id */
+    createdBy?: string;
+    /** 创建时间 */
+    createTime?: string;
+    /** 更新人id */
+    updatedBy?: string;
+    /** 更新时间 */
+    updateTime?: string;
+    userType?: string;
+    /** 扩展信息 */
+    extendInfo?: Record<string, any>;
+    /** 是否收藏 */
+    collect?: boolean;
+    tenantId?: string;
+  };
+
   type PubUserAddDto = {
     /** 登录账号 */
     loginName?: string;
@@ -1471,6 +1573,12 @@ declare namespace API {
     showIsCollect?: boolean;
   };
 
+  type PubUserRoleBo = {
+    orgIdSet?: string[];
+    userIdSet?: string[];
+    userIdOrgIdSet?: string[];
+  };
+
   type PubUserSplitOrgQueryDto = {
     currentPage?: number;
     pageSize?: number;
@@ -1666,6 +1774,14 @@ declare namespace API {
     success?: boolean;
   };
 
+  type ResponseDataListPubUser = {
+    code?: number;
+    msg?: string;
+    hint?: string;
+    data?: PubUser[];
+    success?: boolean;
+  };
+
   type ResponseDataListPubUserDto = {
     code?: number;
     msg?: string;
@@ -1890,6 +2006,14 @@ declare namespace API {
     success?: boolean;
   };
 
+  type ResponseDataPubUser = {
+    code?: number;
+    msg?: string;
+    hint?: string;
+    data?: PubUser;
+    success?: boolean;
+  };
+
   type ResponseDataPubUserBo = {
     code?: number;
     msg?: string;
@@ -1906,6 +2030,14 @@ declare namespace API {
     success?: boolean;
   };
 
+  type ResponseDataPubUserRoleBo = {
+    code?: number;
+    msg?: string;
+    hint?: string;
+    data?: PubUserRoleBo;
+    success?: boolean;
+  };
+
   type ResponseDataPubUserUsed = {
     code?: number;
     msg?: string;
@@ -1985,7 +2117,7 @@ declare namespace API {
     /** 群组id */
     groups?: shujuquanxianmokuaihuixiandequnzuduixiang[];
     /** 资源id */
-    resources?: PubResourceTreeBo[];
+    resources?: PubResource[];
   };
 
   type shujuquanxianchaxunduixiang = {

package/src/api/modules/rbac/yonghujiekou.ts

@@ -1,5 +1,30 @@
 import { basic as request } from '@/api/request';
 
+/**
+ * @description 验证码-修改登录密码
+ * @url /rbac/user/captcha/changePasswordWithVerifyCode
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postRbacUserCaptchaChangePasswordWithVerifyCode<
+  R = API.ResponseDataVoid,
+  T = API.ResponseDataVoid,
+>(
+  params: API.postRbacUserCaptchaChangePasswordWithVerifyCodeParams,
+  options?: Parameters<typeof request.Post<R, T>>[2],
+) {
+  return request.Post<R, T>(
+    '/rbac/user/captcha/changePasswordWithVerifyCode',
+    {},
+    {
+      params: {
+        ...params,
+      },
+      ...(options || {}),
+    },
+  );
+}
+
 /**
  * @description 修改登录密码
  * @url /rbac/user/changePassword
@@ -75,6 +100,85 @@ export function postRbacUserChangePasswordWithVerifyCode<
   );
 }
 
+/**
+ * @description 根据id查询
+ * @url /rbac/user/getUser
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postRbacUserGetUser<
+  R = API.ResponseDataPubUser,
+  T = API.ResponseDataPubUser,
+>(
+  params: API.postRbacUserGetUserParams,
+  options?: Parameters<typeof request.Post<R, T>>[2],
+) {
+  return request.Post<R, T>(
+    '/rbac/user/getUser',
+    {},
+    {
+      params: {
+        ...params,
+      },
+      ...(options || {}),
+    },
+  );
+}
+
+/**
+ * @description 通过用户ID查询用户们
+ * @url /rbac/user/getUserList
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postRbacUserGetUserList<
+  R = API.ResponseDataListPubUser,
+  T = API.ResponseDataListPubUser,
+>(body: string[], options?: Parameters<typeof request.Post<R, T>>[2]) {
+  return request.Post<R, T>('/rbac/user/getUserList', body, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    ...(options || {}),
+  });
+}
+
+/**
+ * @description 获得指定组织的用户数组
+ * @url /rbac/user/getUserListByOrgIds
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postRbacUserGetUserListByOrgIds<
+  R = API.ResponseDataListPubUser,
+  T = API.ResponseDataListPubUser,
+>(body: string[], options?: Parameters<typeof request.Post<R, T>>[2]) {
+  return request.Post<R, T>('/rbac/user/getUserListByOrgIds', body, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    ...(options || {}),
+  });
+}
+
+/**
+ * @description 获得指定岗位的用户数组
+ * @url /rbac/user/getUserListByPostIds
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postRbacUserGetUserListByPostIds<
+  R = API.ResponseDataListPubUser,
+  T = API.ResponseDataListPubUser,
+>(body: string[], options?: Parameters<typeof request.Post<R, T>>[2]) {
+  return request.Post<R, T>('/rbac/user/getUserListByPostIds', body, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    ...(options || {}),
+  });
+}
+
 /**
  * @description 编辑角色和授权数据权限
  * @url /rbac/user/grantUserRoleAndDatPermission
@@ -325,3 +429,21 @@ export function postRbacUserUserUpdateV2<
     ...(options || {}),
   });
 }
+
+/**
+ * @description 校验用户们是否有效
+ * @url /rbac/user/validateUserList
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postRbacUserValidateUserList<
+  R = API.ResponseDataVoid,
+  T = API.ResponseDataVoid,
+>(body: string[], options?: Parameters<typeof request.Post<R, T>>[2]) {
+  return request.Post<R, T>('/rbac/user/validateUserList', body, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    ...(options || {}),
+  });
+}

package/src/api/modules/rbac/ziyuanjiekou.ts

@@ -160,6 +160,27 @@ export function postRbacResourceMineOrAllResourceTree<
   );
 }
 
+/**
+ * @description 资源拖拉拽更新
+ * @url /rbac/resource/reSortUpdate
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postRbacResourceReSortUpdate<
+  R = API.ResponseDataVoid,
+  T = API.ResponseDataVoid,
+>(
+  body: API.PubResourceReSortUpdateDTO[],
+  options?: Parameters<typeof request.Post<R, T>>[2],
+) {
+  return request.Post<R, T>('/rbac/resource/reSortUpdate', body, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    ...(options || {}),
+  });
+}
+
 /**
  * @description 资源删除
  * @url /rbac/resource/resourceDelete

package/src/api/modules/rbac/zuzhijiekou.ts

@@ -187,3 +187,21 @@ export function postRbacOrgUpdateOrg<
     ...(options || {}),
   });
 }
+
+/**
+ * @description 校验组织们是否有效
+ * @url /rbac/org/validateOrgList
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postRbacOrgValidateOrgList<
+  R = API.ResponseDataVoid,
+  T = API.ResponseDataVoid,
+>(body: string[], options?: Parameters<typeof request.Post<R, T>>[2]) {
+  return request.Post<R, T>('/rbac/org/validateOrgList', body, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    ...(options || {}),
+  });
+}

package/src/views/organization/components/drawerOrganization.vue

@@ -5,6 +5,7 @@ import { useToggle } from '@vueuse/core';
 import { message } from 'ant-design-vue';
 import { getDictItemList } from '@/api/modules/configData';
 import { getRbacOrgInfo, postRbacOrgAddOrg, postRbacOrgUpdateOrg } from '@/api/modules/rbac';
+import { selectUser } from '@/components/OrgUserSelector';
 import { ACTION } from '../enum';
 
 defineOptions({
@@ -41,13 +42,25 @@ getDictItemList({ dictCode: 'orgType' }).then((res: API.ResponseDataListDictItem
   });
 });
 const form = ref<Partial<API.PubOrg & { parentName: string }>>({ parentId: '', enable: true });
+const selectedUsers = ref<
+  {
+    orgId?: string
+    userId?: string
+    userName?: string
+  }[]>([]);
 async function onOpen(key: ACTION, record?: API.PubOrg) {
   setOpen(true);
   state.title = key;
+  selectedUsers.value = [];
   if (key === ACTION.EDIT) {
     const res = await getRbacOrgInfo({ id: record?.id as string });
     if (res.success) {
       form.value = res.data ?? {};
+      selectedUsers.value = [{
+        orgId: res.data?.leaderUserOrgId ?? '',
+        userId: res.data?.leaderUserId ?? '',
+        userName: res.data?.leaderUserName ?? '',
+      }];
     }
   }
   else if (key === ACTION.ADDNEXT) {
@@ -67,12 +80,34 @@ async function onOpen(key: ACTION, record?: API.PubOrg) {
   }
 }
 
+function chooseLeader() {
+  selectUser({
+    modelValue: selectedUsers.value, // 回显时选中的数据
+    multiple: false,
+    onSubmit(selected = []) {
+      // console.log(selected); // 点击确认后返回选中的数据
+      selectedUsers.value = selected.map((user) => {
+        return {
+          orgId: user.orgId as string,
+          userId: user.userId as string,
+          userName: user.userName as string,
+        };
+      });
+    },
+  });
+}
+
 const [loading, setLoading] = useToggle(false);
 function onSubmit() {
   const request = state.title === ACTION.EDIT ? postRbacOrgUpdateOrg : postRbacOrgAddOrg;
   formRef.value?.validate().then(() => {
     setLoading(true);
     const params: any = { ...form.value };
+    if (selectedUsers.value.length > 0) {
+      params.leaderUserId = selectedUsers.value[0].userId;
+      params.leaderUserName = selectedUsers.value[0].userName;
+      params.leaderUserOrgId = selectedUsers.value[0].orgId;
+    }
     request(params)
       .then((res: API.ResponseDataPubOrg) => {
         if (res.success) {
@@ -137,6 +172,14 @@ defineExpose({
       <a-form-item label="排序">
         <a-input-number v-model:value="form.sort" />
       </a-form-item>
+      <a-form-item label="组织负责人">
+        <div flex items-center>
+          <span v-if="selectedUsers.length > 0" mr-6px>{{ selectedUsers[0]?.userName }}</span>
+          <a-button type="primary" @click="chooseLeader">
+            选择负责人
+          </a-button>
+        </div>
+      </a-form-item>
       <a-form-item label="统一社会信用代码" name="creditCode">
         <a-input v-model:value="form.creditCode" />
       </a-form-item>