获取pc工作端登陆用户信息 接口变更

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;
 }

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);
-}
+
+    /**
+     * 获取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);
+}

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 = baseDao.selectStaffBasicInfo(userId);
-        StaffBasicInfoResultDTO resultDTO = ConvertUtils.sourceToTarget(staffEntity, StaffBasicInfoResultDTO.class);
-        resultDTO.setGender(String.valueOf(staffEntity.getGender()));
         return new Result<StaffBasicInfoResultDTO>().ok(resultDTO);
     }
 

epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml

@@ -309,4 +309,28 @@
         ORDER BY created_time DESC
         LIMIT 1
     </select>
-</mapper>
+
+    <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>