完善亮旗党员-分页列表，修改党员亮旗审核处理

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)
@@ -2014,10 +2012,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         entity.setExamineFlag(form.getExamineStatus());
         if (partyStandardBearerApplyService.updateById(entity)) {
             String TagId = baseDao.selectTagId(UserTagEnum.PARTY_STANDARD_BEARER.value());
-            PartyTagRelationEntity TagRelEntity = new PartyTagRelationEntity();
+            UserTagRelationEntity TagRelEntity = new UserTagRelationEntity();
-            TagRelEntity.setPartyId(form.getId());
+            TagRelEntity.setUserId(form.getId());
             TagRelEntity.setTagId(TagId);
-            partyTagRelationService.insert(TagRelEntity);
+            userTagRelationService.insert(TagRelEntity);
             return new Result();
         }
         return new Result().error("党员亮旗审核处理失败");

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@@ -1838,22 +1838,26 @@
             u.IDENTITY_NO,
             u.address,
             u.CREATED_TIME,
-            u.id,
+            u.id AS userId,
-            a.USER_ID,
+            u.DEPT_ID,
-            a.GRID_ID AS deptId,
+            r.id
         FROM
-            epdc_user u
+            epdc_user_tag_relation r
-            LEFT JOIN epdc_party_tag_relation r ON u.id = r.PARTY_ID
+        LEFT JOIN epdc_user u ON r.USER_ID = u.id
-            AND r.DEL_FLAG = '0'
+        AND u.DEL_FLAG = '0'
         <where>
-            u.del_flag = '0'
+            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>