From a0872208cb397d8a207f39d02f878cd90a2efbf7 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Fri, 21 Feb 2020 14:38:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E8=AE=A4=E8=AF=81=E5=85=9A=E5=91=98?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=95=B0=E5=92=8C=E5=85=9A=E5=91=98=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E6=8E=92=E8=A1=8C=E9=A1=B5=E7=BB=9F=E8=AE=A1=E6=95=B0?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=20bug=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/user/UserAnalysisDao.xml |  2 +-
 .../service/impl/PartyMembersServiceImpl.java |  4 +++
 .../main/resources/mapper/PartyMembersDao.xml | 25 +++++++++++++------
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
index 9a58f5628..8cfe83003 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
@@ -22,7 +22,7 @@
             FROM (
                 SELECT
                     uu.ID AS userId,
-                    CASE WHEN uu.SEX != '0' AND uu.SEX != '1' THEN '2' ELSE uu.SEX END AS SEX,
+                    CASE WHEN uu.SEX is null or uu.SEX != '0' AND uu.SEX != '1' THEN '2' ELSE uu.SEX END AS SEX,
                     uu.STATE, uu.PARTY_FLAG, uu.DEPT_ID,
                     IFNULL( TIMESTAMPDIFF( YEAR, uu.BIRTHDAY, CURDATE()), 0 ) age,
                     ad2.`name` streetName, ad2.id streetId
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
index b507b5fc5..ccc162fe0 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
@@ -27,6 +27,8 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.config.StreamUtils;
@@ -88,6 +90,8 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
 
     @Override
     public Result<PageData<PartyMembersDTO>> hasAuthenticationPartyPage(Map<String, Object> params) {
+        UserDetail userDetail = SecurityUser.getUser();
+        params.put("deptIdList", userDetail.getDeptIdList());
         IPage<PartyMembersDTO> page = getPage(params);
         List<PartyMembersDTO> list = baseDao.hasAuthenticationPartyPage(params);
         return new Result<PageData<PartyMembersDTO>>().ok(new PageData<>(list, page.getTotal()));
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
index 708f55c56..67322b916 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
@@ -88,22 +88,33 @@
     <select id="hasAuthenticationPartyPage" resultType="com.elink.esua.epdc.dto.PartyMembersDTO">
         SELECT
         pm.CADRE_FLAG,
-        pm.CREATED_BY,user.CREATED_TIME,
+        pm.CREATED_BY,eu.CREATED_TIME,
         pm.DEPT_ID,
         pm.ID,pm.IDENTITY_NO,pm.MOBILE,pm.POST,
-        pm.POST_VALUE,pm.REAL_NAME,pm.REGIST_FLAG,user.REGISTER_TIME as registTime,
+        pm.POST_VALUE,pm.REAL_NAME,pm.REGIST_FLAG,eu.REGISTER_TIME as registTime,
         pm.REVISION,
         GROUP_CONCAT( ut.TAG_NAME ) TAG_NAME,
         pm.ALL_DEPT_NAMES as allDeptNames
         FROM
-        epdc_party_members pm
+        epdc_user eu
+        LEFT JOIN esua_epdc_admin.sys_dept ad ON eu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party'
+        LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = ad.pid
+        LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid
+        LEFT JOIN epdc_party_members pm on pm.IDENTITY_NO = eu.IDENTITY_NO and pm.REAL_NAME = eu.REAL_NAME
         LEFT JOIN epdc_party_tag_relation pt ON pm.ID = pt.PARTY_ID
         LEFT JOIN epdc_user_tag ut ON pt.TAG_ID = ut.ID
         AND ut.DEL_FLAG = '0'
-        INNER JOIN  epdc_user user ON user.IDENTITY_NO = pm.IDENTITY_NO
-        AND user.DEL_FLAG = '0' AND user.PARTY_FLAG = '1'
         WHERE
-        pm.DEL_FLAG = '0'
+           eu.PARTY_FLAG = '1' and eu.DEL_FLAG = '0' and pm.DEL_FLAG = '0'
+        <choose>
+            <when test="gridId != null and gridId != ''">AND ad2.ID = #{gridId}</when>
+            <otherwise>
+                <if test="deptIdList != null and deptIdList.size() > 0">
+                    AND ad2.ID in
+                    <foreach collection="deptIdList" item="deptId" open="(" separator="," close=")">#{deptId}</foreach>
+                </if>
+            </otherwise>
+        </choose>
         <if test="realName != null and realName != '' ">
             and pm.REAL_NAME = #{realName}
         </if>
@@ -139,7 +150,7 @@
             <![CDATA[ and pm.REGIST_TIME <= ]]> #{endTime}
         </if>
         GROUP BY
-        pm.ID
+        eu.ID
         ORDER BY
         pm.CREATED_TIME DESC
     </select>