From c94f3c34d1c2c5a1d5e7010ab1e3cd0aded3cfac Mon Sep 17 00:00:00 2001
From: 郑永安 <zyazyz250@sina.com>
Date: 星期二, 15 八月 2023 09:40:37 +0800
Subject: [PATCH] Merge branch 'zya'
---
src/main/java/com/gk/hotwork/Controller/UserController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/gk/hotwork/Controller/UserController.java b/src/main/java/com/gk/hotwork/Controller/UserController.java
index c77f074..b65bdd6 100644
--- a/src/main/java/com/gk/hotwork/Controller/UserController.java
+++ b/src/main/java/com/gk/hotwork/Controller/UserController.java
@@ -180,7 +180,10 @@
if (StringUtils.isNotBlank(job)){
condition.put("job",job.trim());
}
-
+ Integer type = getUser().getType();
+ if(type.equals(3)){
+ condition.put("companyid",getUser().getCompanyid());
+ }
pageInfo.setCondition(condition);
userService.selectCompanyUserDataGrid(pageInfo);
--
Gitblit v1.9.2