From b4aebf6e404d73f119d0cee1948cee27623648d2 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Wed, 26 Aug 2020 10:23:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96pc=E5=B7=A5=E4=BD=9C=E7=AB=AF?=
 =?UTF-8?q?=E7=99=BB=E9=99=86=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=20?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/StaffBasicInfoResultDTO.java   | 23 +++++++++++++---
 .../java/com/epmet/dao/CustomerStaffDao.java  | 13 +++++++++-
 .../impl/CustomerStaffServiceImpl.java        |  4 +--
 .../resources/mapper/CustomerStaffDao.xml     | 26 ++++++++++++++++++-
 4 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java
index 1f3388c4b1..04962a5396 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java
@@ -19,7 +19,7 @@ public class StaffBasicInfoResultDTO implements Serializable {
 	/**
 	 * 用户Id
 	 */
-	private String userId;
+	private String id;
 
 	/**
 	 * 真实姓名
@@ -31,6 +31,11 @@ public class StaffBasicInfoResultDTO implements Serializable {
 	 */
 	private String gender;
 
+	/**
+	 * 头像
+	 */
+	private String headUrl;
+
 	/**
 	 * 邮箱
 	 */
@@ -39,10 +44,20 @@ public class StaffBasicInfoResultDTO implements Serializable {
 	/**
 	 * 手机号
 	 */
-	private String mobile;
+	private String phone;
 
 	/**
-	 * 地址
+	 * 微信openId
 	 */
-	private String address;
+	private String wxOpenId;
+
+    /**
+     * 超级管理员   0：否   1：是
+     */
+    private Integer superAdmin;
+
+    /**
+     * 状态  0：停用    1：正常
+     */
+    private Integer status;
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java
index 1b7753ed18..2fdc573473 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java
@@ -180,4 +180,15 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
 	 * @Description 根据客户Id和手机号查询工作人员信息
 	 **/
     GovWebOperLoginResultDTO selectByCustomerIdAndPhone(GovWebOperLoginFormDTO formDTO);
-}
\ No newline at end of file
+
+    /**
+     * 获取pc工作端登陆用户信息
+     *  根据token中userId，去查询登陆用户基本信息
+     *
+     * @param userId
+     * @return com.epmet.dto.result.StaffBasicInfoResultDTO
+     * @Author zhangyong
+     * @Date 10:07 2020-08-26
+     **/
+	StaffBasicInfoResultDTO selectStaffBasicInfo(@Param("userId") String userId);
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
index 9d57e1c0dd..72f9c416b2 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
@@ -649,9 +649,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 
     @Override
     public Result<StaffBasicInfoResultDTO> selectStaffBasicInfo(String userId) {
-        CustomerStaffEntity staffEntity = baseDao.selectByUserId(userId);
-        StaffBasicInfoResultDTO resultDTO = ConvertUtils.sourceToTarget(staffEntity, StaffBasicInfoResultDTO.class);
-        resultDTO.setGender(String.valueOf(staffEntity.getGender()));
+        StaffBasicInfoResultDTO resultDTO = baseDao.selectStaffBasicInfo(userId);
         return new Result<StaffBasicInfoResultDTO>().ok(resultDTO);
     }
 
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
index 703bab3351..94aaebe1a6 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
@@ -309,4 +309,28 @@
         ORDER BY created_time DESC
         LIMIT 1
     </select>
-</mapper>
\ No newline at end of file
+
+    <select id="selectStaffBasicInfo" resultType="com.epmet.dto.result.StaffBasicInfoResultDTO">
+        SELECT
+            cs.CUSTOMER_ID customerId,
+            cs.USER_ID id,
+            cs.REAL_NAME realName,
+            cs.GENDER gender,
+            cs.EMAIL email,
+            cs.MOBILE phone,
+            1 superAdmin,
+            CASE cs.ENABLE_FLAG
+                WHEN 'enable' THEN
+                    1
+                ELSE
+                    0
+            END `status`,
+            cs.HEAD_PHOTO headUrl,
+            '' wxOpenId
+        FROM
+            customer_staff cs
+        WHERE
+            cs.DEL_FLAG = '0'
+            AND cs.USER_ID = #{userId}
+    </select>
+</mapper>