|
@@ -79,7 +79,7 @@ import "bpmn-js-token-simulation/assets/css/bpmn-js-token-simulation.css";
|
|
|
import { getProcess, getNodeData } from "@/api/bpmprocess/process";
|
|
|
|
|
|
import { listScript } from "@/api/bpmprocess/process";
|
|
|
-import { listUser } from "@/api/system/user";
|
|
|
+import { listUser, getUserListByTenantId } from "@/api/system/user";
|
|
|
import { listRole } from "@/api/system/role";
|
|
|
|
|
|
export default {
|
|
@@ -143,8 +143,12 @@ export default {
|
|
|
},
|
|
|
// 获取所有用户列表
|
|
|
async getAllUserList() {
|
|
|
+ // console.log(this.$store.state.user.tenant.tenantId);
|
|
|
try {
|
|
|
- let res = await listUser({ isEnablePaging: false });
|
|
|
+ // let res = await listUser({ isEnablePaging: false });
|
|
|
+ let res = await getUserListByTenantId({
|
|
|
+ tenantId: this.$store.state?.user?.tenant?.tenantId,
|
|
|
+ });
|
|
|
if (res.code == 200) {
|
|
|
// res.rows.forEach((item) => {
|
|
|
// this.exeUserValueList.push({
|