Merge branch 'wwt'

src/api/deps/index.js

@@ -61,6 +61,14 @@ export const userV2List = (data) => {
     data,
   })
 }
+// 过滤测试数据的erp用户接口
+export const userV2List2 = (data) => {
+  return request({
+    url: '/api/v1/group/erp/users',
+    method: 'POST',
+    data,
+  })
+}
 
 export const groupCreateDept = (data) => {
   return request({

src/pages/chooseByDeps/index.vue

@@ -884,7 +884,7 @@ const handleConfirm = async () => {
         departmentIds: allCheckedList.value.map((v) => v.ID),
         status: 'notactive',
       })
-      if (res.status == 0 && res.data?.data?.length) {
+      if (res.code == 200 && res.data?.data?.length) {
         res.data?.data.forEach((v) => {
           // 检查是否已存在相同 ID 的成员
           if (!listT.some((item) => item.ID === v.ID)) {
@@ -1035,7 +1035,7 @@ const getCurrentMembers = async (depItem) => {
     return
   }
   const res = await getDepMembers(params)
-  if (res.status === 0) {
+  if (res.code === 200) {
     currentMembers.value = res?.data?.data?.length
       ? res.data.data.map((v) => {
           return {

src/pages/chooseMembers/index.vue

@@ -404,7 +404,7 @@ const getCurrentMembers = async (depItem) => {
     departmentId: depItem.ID,
     status: 'notactive',
   })
-  if (res.status === 0) {
+  if (res.code === 200) {
     currentMembers.value = res.data.data.length
       ? res.data.data.map((v) => {
           return {
@@ -628,7 +628,7 @@ const handleConfirm = async () => {
     departmentIds: allCheckedList.value.map((v) => v.ID),
     status: 'notactive',
   })
-  if (res.status == 0 && res.data?.data?.length) {
+  if (res.code == 200 && res.data?.data?.length) {
     res.data?.data.forEach((v) => {
       listT.push(v)
     })

src/store/groupType/index.js

@@ -13,6 +13,7 @@ import {
   departmentV2TreeAll2,
   userHasPermission,
   userV2List,
+  userV2List2,
   v2TreePositionByDepartment,
 } from '@/api/deps/index.js'
 import { useAuth } from '@/store/auth'
@@ -88,7 +89,7 @@ export const useGroupTypeStore = createGlobalState(() => {
   }
 
   const getDepMembers = async (param) => {
-    const res = await userV2List(param)
+    const res = await userV2List2(param)
     return res
   }