From 7c12c271aeb99801d1ca02065d344b498ca9ff44 Mon Sep 17 00:00:00 2001 From: yujt Date: Wed, 6 May 2020 17:09:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=9C=80=E6=96=B0=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/controller/PartyMembersController.java | 2 +- .../com/elink/esua/epdc/service/impl/UserServiceImpl.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java index 3c092d0..c01b05d 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java +++ b/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 params, HttpServletResponse response) throws Exception { ExcelUtils.exportExcelToTarget(response, "已认证党员", partyMembersService.exportHasMoudle(params), PartyMembersExcel.class); } diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index fdf45f9..abbc20e 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -273,6 +273,8 @@ public class UserServiceImpl extends BaseServiceImpl 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 implem //进行居民认证 UserDTO userDTO = modifyResidentInfo(completeAppUser, userGridRelation, parentAndAllDeptDTO); + userDTO.setGrid(userGridRelation.getGrid()); Result result = new Result(); @@ -933,6 +936,7 @@ public class UserServiceImpl extends BaseServiceImpl implem // 更新用户表党员相关字段 updateUserPartyMemberInfo(userDTO); } else { + userDTO.setPartyFlag(YesOrNoEnum.NO.value()); result = new Result().error(UserModuleErrorCode.AUTHENTICATION_CODE); } }