From e7f5125534a77032daf8c5ebc02b51c3946e2d61 Mon Sep 17 00:00:00 2001
From: wangpeng <wangpeng@zcloudchina.com>
Date: Thu, 11 Apr 2024 12:33:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=9B=BF=E6=8D=A2CORPINFO=5F?=
 =?UTF-8?q?ID=E9=80=9A=E7=94=A8=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/system/UsersController.java    |  4 +--
 .../mapper/datasource/system/UsersMapper.java |  2 --
 .../zcloud/service/system/UsersService.java   |  1 -
 .../service/system/impl/UsersServiceImpl.java |  5 ----
 .../mybatis/datasource/system/UsersMapper.xml | 29 +++----------------
 5 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/src/main/java/com/zcloud/controller/system/UsersController.java b/src/main/java/com/zcloud/controller/system/UsersController.java
index 6767590..394b35c 100644
--- a/src/main/java/com/zcloud/controller/system/UsersController.java
+++ b/src/main/java/com/zcloud/controller/system/UsersController.java
@@ -240,7 +240,7 @@ public class UsersController extends BaseController {
         String errInfo = "success";
         PageData pd = new PageData();
         pd = this.getPageData();
-
+        pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
         //page.setPd(pd);
         List<PageData> userList = usersService.userSelectPersonTypelist(pd);//列出用户列表
         map.put("userList", userList);
@@ -3031,7 +3031,7 @@ public class UsersController extends BaseController {
         String errInfo = "success";
         PageData pd = new PageData();
         pd = this.getPageData();
-        //page.setPd(pd);
+        pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
         List<PageData> userList = usersService.getPractitionerSelectList(pd);//列出用户列表
         map.put("userList", userList);
         map.put("pd", pd);
diff --git a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
index 093e642..b71dfc6 100644
--- a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
+++ b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
@@ -272,8 +272,6 @@ public interface UsersMapper {
 
 	List<PageData> studentlist(PageData pd);
 
-	List<PageData> userSelectPersonTypelistPage(PageData pd);
-
 	/**从业人员列表	//userlistPage(Page page)
 	 * @param page
 	 * @return
diff --git a/src/main/java/com/zcloud/service/system/UsersService.java b/src/main/java/com/zcloud/service/system/UsersService.java
index 9da46bd..05754ed 100644
--- a/src/main/java/com/zcloud/service/system/UsersService.java
+++ b/src/main/java/com/zcloud/service/system/UsersService.java
@@ -318,7 +318,6 @@ public interface UsersService {
 
 	void setState(PageData request) throws Exception;
 
-	List<PageData> userSelectPersonTypelistPage(PageData pageData);
 
 	List<PageData> studentlist(PageData pd) throws Exception;
 
diff --git a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
index ab1e5a6..d0c427a 100644
--- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
+++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
@@ -668,11 +668,6 @@ public class UsersServiceImpl implements UsersService {
         usersMapper.editUser(request);
     }
 
-    @Override
-    public List<PageData> userSelectPersonTypelistPage(PageData pd) {
-        return usersMapper.userSelectPersonTypelistPage(pd);
-    }
-
     /**
      * 获取可以培训的人员列表
      *
diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml
index 168e881..5344e4d 100644
--- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml
+++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml
@@ -1648,30 +1648,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		left join sys_dictionaries d on r.PERSONNEL_TYPE = d.DICTIONARIES_ID
 		where
 		u.ISDELETE = 0
-		and d.DICTIONARIES_ID = '5ae743c76dbf496eb1b5101075b073d5'
-	</select>
-
-	<!-- 用户类型用户列表 -->
-	<select id="userSelectPersonTypelistPage" parameterType="pd" resultType="pd" >
-		select
-		u.USER_ID,
-		u.USERNAME,
-		u.PASSWORD,
-		u.LAST_LOGIN,
-		u.NAME,
-		u.SEX,
-		u.IP,
-		u.EMAIL,
-		u.NUMBER,
-		u.PHONE,
-		u.ISMAIN,
-		u.PUSH_CID,
-		r.PERSONNEL_TYPE
-		from <include refid="tableName"></include> u
-		left join sys_userinfo r on u.USER_ID = r.USER_ID
-		left join sys_dictionaries d on r.PERSONNEL_TYPE = d.DICTIONARIES_ID
-		where
-		u.ISDELETE = 0
+		<if test="CORPINFO_ID != null and CORPINFO_ID != ''"><!-- 关键词检索 -->
+			AND u.CORPINFO_ID = #{CORPINFO_ID}
+		</if>
 		and d.DICTIONARIES_ID = '5ae743c76dbf496eb1b5101075b073d5'
 	</select>
 
@@ -1863,7 +1842,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="PARENT_ID != null and PARENT_ID != ''">		<!-- 从业类别 -->
 			and d.PARENT_ID=#{PARENT_ID}
 		</if>
-		where u.ISDELETE = 0 and u.ISMAIN = '0'
+		where u.ISDELETE = 0 and u.ISMAIN = '0' and u.CORPINFO_ID = #{CORPINFO_ID}
 		and d.BIANMA LIKE CONCAT(CONCAT('%', #{BIANMA}),'%')
 	</select>