同步最新代码

epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java

@@ -158,7 +158,7 @@ public class PartyMembersController {
      * @date 2019/12/29 14:43
      */
     @GetMapping("hasAuthenticationexport")
-    @DataFilter(tableAlias = "pm", deptId = "grid_id", prefix = "AND", isPendingCreator = false)
+    @DataFilter(tableAlias = "eu", prefix = "AND", isPendingCreator = false)
     public void hasAuthenticationexport(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         ExcelUtils.exportExcelToTarget(response, "已认证党员", partyMembersService.exportHasMoudle(params), PartyMembersExcel.class);
     }

epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -273,6 +273,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         // 修改党员库信息
         if (YesOrNoEnum.YES.value().equals(dto.getPartyFlag())) {
             updatePartyMember(findUser, dto.getRegisterTime());
+            // 党员认证成功,生成用户身份标签
+            userTagRelationService.addUserTagRelation(dto.getId(), UserTagEnum.PARTY_MEMBER.value());
         }
 
         return new Result<>();
@@ -918,6 +920,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
         //进行居民认证
         UserDTO userDTO = modifyResidentInfo(completeAppUser, userGridRelation, parentAndAllDeptDTO);
+        userDTO.setGrid(userGridRelation.getGrid());
 
         Result result = new Result();
 
@@ -933,6 +936,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
                 // 更新用户表党员相关字段
                 updateUserPartyMemberInfo(userDTO);
             } else {
+                userDTO.setPartyFlag(YesOrNoEnum.NO.value());
                 result = new Result().error(UserModuleErrorCode.AUTHENTICATION_CODE);
             }
         }