From b37c6bea6b7f7a0f2a17887ba0da29cf41c6239a Mon Sep 17 00:00:00 2001
From: wangpeng <wangpeng@zcloudchina.com>
Date: Mon, 8 Apr 2024 20:12:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=8E=E4=B8=9A=E4=BA=BA=E5=91=98=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7select=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/system/UsersController.java    | 23 +++++++++++++++
 .../mapper/datasource/system/UsersMapper.java |  1 +
 .../zcloud/service/system/UsersService.java   |  2 ++
 .../service/system/impl/UsersServiceImpl.java |  5 ++++
 .../mybatis/datasource/system/UsersMapper.xml | 28 +++++++++++++++++++
 5 files changed, 59 insertions(+)

diff --git a/src/main/java/com/zcloud/controller/system/UsersController.java b/src/main/java/com/zcloud/controller/system/UsersController.java
index 5af317c..863fc53 100644
--- a/src/main/java/com/zcloud/controller/system/UsersController.java
+++ b/src/main/java/com/zcloud/controller/system/UsersController.java
@@ -3015,4 +3015,27 @@ public class UsersController extends BaseController {
         map.put("result", errInfo);
         return map;
     }
+
+    /**
+     * 人员列表(select)
+     *
+     * @param
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping("/getPractitionerSelectList")
+    @ResponseBody
+    @LogAnno(menuType = "综合管理", menuServer = "特种设备", instructionsOperate = "设备管理", instructionsType = "用户列表")
+    public Object getPractitionerSelectList() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        //page.setPd(pd);
+        List<PageData> userList = usersService.getPractitionerSelectList(pd);//列出用户列表
+        map.put("userList", userList);
+        map.put("pd", pd);
+        map.put("result", errInfo);
+        return map;
+    }
 }
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 4afc6ab..09a5f6a 100644
--- a/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
+++ b/src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
@@ -298,4 +298,5 @@ public interface UsersMapper {
 
 	PageData getUserByUserId(PageData pd);
 
+	List<PageData> getPractitionerSelectList(PageData pd);
 }
diff --git a/src/main/java/com/zcloud/service/system/UsersService.java b/src/main/java/com/zcloud/service/system/UsersService.java
index 4865b92..2ed77ea 100644
--- a/src/main/java/com/zcloud/service/system/UsersService.java
+++ b/src/main/java/com/zcloud/service/system/UsersService.java
@@ -371,4 +371,6 @@ public interface UsersService {
 
 	PageData getUserByUserId(PageData pd);
 
+	List<PageData> getPractitionerSelectList(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 3059864..0eb0fba 100644
--- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
+++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
@@ -1340,5 +1340,10 @@ public class UsersServiceImpl implements UsersService {
         return usersMapper.getUserByUserId(pd);
     }
 
+    @Override
+    public List<PageData> getPractitionerSelectList(PageData pd) throws Exception {
+        return usersMapper.getPractitionerSelectList(pd);
+    }
+
 
 }
diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml
index 87ea9cd..6c67a2e 100644
--- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml
+++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml
@@ -522,6 +522,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND
 			u.CORPINFO_ID = #{pd.CORPINFO_ID}
 		</if>
+		<if test="pd.PERSONNEL_TYPE != null and pd.PERSONNEL_TYPE != ''"><!-- 关键词检索 -->
+			AND c.PERSONNEL_TYPE = #{pd.PERSONNEL_TYPE}
+		</if>
 		order by d.LEVEL  asc ,d.DEP_ORDER,d.DEPARTMENT_ID asc, u.SORT asc,u.USER_ID
 	</select>
 
@@ -1839,4 +1842,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		USER_ID = #{USER_ID}
 	</update>
 
+	<select id="getPractitionerSelectList" resultType="com.zcloud.entity.PageData">
+		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
+		<if test="PARENT_ID != null and PARENT_ID != ''">		<!-- 从业类别 -->
+			and d.PARENT_ID=#{PARENT_ID}
+		</if>
+		where u.ISDELETE = 0 and u.ISMAIN = '0'
+		and d.BIANMA LIKE CONCAT(CONCAT('%', #{BIANMA}),'%')
+	</select>
+
 </mapper>