From 09e75bcaad8452841fc74d7cef5a8ba91fe24f43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Thu, 16 Oct 2025 02:31:41 +0800 Subject: [PATCH] =?UTF-8?q?feat(user):=20=E6=9B=B4=E6=96=B0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=AE=A1=E6=A0=B8=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改组件名称从 List为 UserVerifyAdmin - 移除 addUserRole 导入,保留 listUserRole 和 updateUserRole - 新增导入 listOrganizations 接口- 更新查询逻辑以支持 organizationIds 过滤 - 注释掉原有的组织权限判断代码 - 调整 SERVER_API_URL 地址为本地开发地址 - 在 model 中增加 organizationIds 字段定义 --- src/api/system/userVerify/model/index.ts | 1 + src/user/userVerify/admin.tsx | 31 +++++++++++++++++------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/api/system/userVerify/model/index.ts b/src/api/system/userVerify/model/index.ts index cb974dd..351d6f6 100644 --- a/src/api/system/userVerify/model/index.ts +++ b/src/api/system/userVerify/model/index.ts @@ -61,5 +61,6 @@ export interface UserVerifyParam extends PageParam { id?: number; status?: number; organizationId?: number; + organizationIds?: any[]; keywords?: string; } diff --git a/src/user/userVerify/admin.tsx b/src/user/userVerify/admin.tsx index a99dc87..0ac71bf 100644 --- a/src/user/userVerify/admin.tsx +++ b/src/user/userVerify/admin.tsx @@ -11,13 +11,14 @@ import {Search, Calendar, Truck, File} from '@nutui/icons-react-taro' import Taro from '@tarojs/taro' import {UserVerify} from "@/api/system/userVerify/model"; import {pageUserVerify, updateUserVerify} from "@/api/system/userVerify"; -import {addUserRole, listUserRole, updateUserRole} from "@/api/system/userRole"; +import {listUserRole, updateUserRole} from "@/api/system/userRole"; +import {listOrganizations} from "@/api/system/organization"; /** * 报险记录列表页面 */ -const List: React.FC = () => { +const UserVerifyAdmin: React.FC = () => { const [list, setList] = useState([]) const [loading, setLoading] = useState(false) const [keywords, setKeywords] = useState('') @@ -44,17 +45,29 @@ const List: React.FC = () => { setRefreshing(true) const where = { + organizationIds: undefined, keywords: keywords.trim(), } - if (Taro.getStorageSync('RoleCode') == 'zhandian') { + // if (Taro.getStorageSync('RoleCode') == 'zhandian') { // @ts-ignore - where.organizationId = Taro.getStorageSync('OrganizationId') - } - if (Taro.getStorageSync('RoleCode') == 'kuaidi') { + // where.organizationId = Taro.getStorageSync('OrganizationId') + // } + // if (Taro.getStorageSync('RoleCode') == 'kuaidi') { // @ts-ignore - where.OrganizationParentId = Taro.getStorageSync('OrganizationParentId') - } + // where.OrganizationParentId = Taro.getStorageSync('OrganizationParentId') + // } + + const organizations = await listOrganizations({ + parentId: Taro.getStorageSync('OrganizationId') + }) + const organizationIds = organizations.map(item => item.organizationId) + // 把Taro.getStorageSync('OrganizationId')也放入数组 + organizationIds.push(Taro.getStorageSync('OrganizationId')) + + console.log(organizationIds,'organizationIds') + // @ts-ignore + where.organizationIds = organizationIds; const res = await pageUserVerify(where) @@ -316,4 +329,4 @@ const List: React.FC = () => { ) } -export default List +export default UserVerifyAdmin