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