From 359703e55ddb411b6ff3d7a1db0b974e383b90c1 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Fri, 29 Apr 2022 15:04:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=AE=E6=97=97=E5=85=9A?=
 =?UTF-8?q?=E5=91=98-=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=9A=E5=91=98=E4=BA=AE=E6=97=97=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/user/controller/UserController.java  |  4 +--
 .../user/service/impl/UserServiceImpl.java    | 10 +++----
 .../src/main/resources/mapper/UserDao.xml     | 26 +++++++++++--------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserController.java
index b8b0d272a..18bd8f903 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserController.java
@@ -300,7 +300,7 @@ public class UserController {
      * 亮旗党员-分页列表
      *
      * @param params
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.user.dto.UserStandaeBearerPage>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.user.dto.UserStandaeBearerPage>>
      * @author LZN
      * @date 2022/4/29 10:53
      */
@@ -319,7 +319,7 @@ public class UserController {
      * @date 2022/4/29 10:57
      */
     @PostMapping("/partymembers/standardbearer/examine")
-    public Result standaedBearerExamine(@RequestBody StandardBearerExamineFormDTO form){
+    public Result standaedBearerExamine(@RequestBody StandardBearerExamineFormDTO form) {
         return userService.standaedBearerExamine(form);
     }
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java
index bfbb94c67..4b696de35 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserServiceImpl.java
@@ -132,8 +132,6 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Autowired
     private PartyStandardBearerApplyService partyStandardBearerApplyService;
 
-    @Autowired
-    private PartyTagRelationService partyTagRelationService;
 
     @Override
     @DataSource(value = DataSourceNames.FIRST)
@@ -2012,12 +2010,12 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         entity.setId(form.getId());
         entity.setRemark(form.getRemark());
         entity.setExamineFlag(form.getExamineStatus());
-        if(partyStandardBearerApplyService.updateById(entity)){
+        if (partyStandardBearerApplyService.updateById(entity)) {
             String TagId = baseDao.selectTagId(UserTagEnum.PARTY_STANDARD_BEARER.value());
-            PartyTagRelationEntity TagRelEntity = new PartyTagRelationEntity();
-            TagRelEntity.setPartyId(form.getId());
+            UserTagRelationEntity TagRelEntity = new UserTagRelationEntity();
+            TagRelEntity.setUserId(form.getId());
             TagRelEntity.setTagId(TagId);
-            partyTagRelationService.insert(TagRelEntity);
+            userTagRelationService.insert(TagRelEntity);
             return new Result();
         }
         return new Result().error("党员亮旗审核处理失败");
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
index 1623724b2..f68d23e4e 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
@@ -1831,29 +1831,33 @@
         </where>
     </select>
     <select id="brightFlagPartyMem" resultType="com.elink.esua.epdc.user.dto.UserStandaeBearerPage">
-        SELECT
+	    SELECT
             u.REAL_NAME,
             u.MOBILE,
             u.ALL_DEPT_NAMES,
             u.IDENTITY_NO,
             u.address,
             u.CREATED_TIME,
-            u.id,
-            a.USER_ID,
-            a.GRID_ID AS deptId,
+            u.id AS userId,
+            u.DEPT_ID,
+            r.id
         FROM
-            epdc_user u
-            LEFT JOIN epdc_party_tag_relation r ON u.id = r.PARTY_ID
-            AND r.DEL_FLAG = '0'
+            epdc_user_tag_relation r
+        LEFT JOIN epdc_user u ON r.USER_ID = u.id
+        AND u.DEL_FLAG = '0'
         <where>
-            u.del_flag = '0'
-            AND u.IDENTITY_NO = #{identityNo}
-            AND r.PARTY_ID = #{userId}
+            r.del_flag = '0'
+            <if test="identityNo != null and identityNo != ''">
+                AND u.IDENTITY_NO = #{identityNo}
+            </if>
+            <if test="userId != null and userId != ''">
+                AND r.PARTY_ID = #{userId}
+            </if>
             <if test="realName != null and realName != ''">
                 AND u.REAL_NAME = #{realName}
             </if>
             <if test="deptId != null and deptId != ''">
-                AND a.GRID_ID = #{deptId}
+                AND u.DEPT_ID = #{deptId}
             </if>
         </where>
     </select>