From f20dcaa5f59641038b8f2c908c4bb731239a5bce Mon Sep 17 00:00:00 2001 From: HAHA Date: Mon, 30 May 2022 15:56:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=A0=E9=99=A4IcVolunteerPolyCategory?= =?UTF-8?q?=E8=A1=A8=E7=BB=8F=E7=BA=AC=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/entity/IcVolunteerPolyCategoryEntity.java | 9 --------- .../main/resources/mapper/IcVolunteerPolyCategoryDao.xml | 2 -- 2 files changed, 11 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVolunteerPolyCategoryEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVolunteerPolyCategoryEntity.java index fa15bdc41e..f37b64ad82 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVolunteerPolyCategoryEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVolunteerPolyCategoryEntity.java @@ -33,14 +33,5 @@ public class IcVolunteerPolyCategoryEntity extends BaseEpmetEntity { */ private String volunteerCategory; - /** - * 经度 - */ - private String longitude; - - /** - * 纬度 - */ - private String latitude; } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyCategoryDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyCategoryDao.xml index 0029247482..0e22f4e976 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyCategoryDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyCategoryDao.xml @@ -8,8 +8,6 @@ - - From d6b5fb976608d8b72292ca9beefdc3578d4be38b Mon Sep 17 00:00:00 2001 From: HAHA Date: Mon, 30 May 2022 16:12:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0flyaway=EF=BC=8C=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=BB=8F=E7=BA=AC=E5=BA=A6=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcVolunteerPolyServiceImpl.java | 10 ---------- .../migration/V0.0.51__ic_volunteer_poly_category.sql | 3 +++ 2 files changed, 3 insertions(+), 10 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.51__ic_volunteer_poly_category.sql diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVolunteerPolyServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVolunteerPolyServiceImpl.java index 198d4a6e4c..c2de05f566 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVolunteerPolyServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVolunteerPolyServiceImpl.java @@ -256,8 +256,6 @@ public class IcVolunteerPolyServiceImpl extends BaseServiceImpl Date: Mon, 30 May 2022 16:34:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=9B=B8=E5=85=B3bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcPartyMemberController.java | 4 ++-- .../service/IcPartyMemberService.java | 2 +- .../impl/IcPartyMemberServiceImpl.java | 19 ++++++++++++++++++- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java index bfd266384f..3390d45acc 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java @@ -82,8 +82,8 @@ public class IcPartyMemberController implements ResultDataResolver { } @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ - IcPartyMemberDTO data = icPartyMemberService.get(id); + public Result get(@LoginUser TokenDto tokenDto, @PathVariable("id") String id){ + IcPartyMemberDTO data = icPartyMemberService.get(tokenDto, id); return new Result().ok(data); } @NoRepeatSubmit diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java index c0ea774846..0d84d90723 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java @@ -53,7 +53,7 @@ public interface IcPartyMemberService extends BaseService { * @author generator * @date 2022-05-17 */ - IcPartyMemberDTO get(String id); + IcPartyMemberDTO get(TokenDto tokenDto, String id); /** * 默认保存 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java index ef8e0eb205..122212ccfd 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java @@ -172,7 +172,22 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl orgWrapper = new LambdaQueryWrapper<>(); + orgWrapper.eq(IcPartyOrgEntity::getCustomerId, tokenDto.getCustomerId()); + orgWrapper.eq(IcPartyOrgEntity::getAgencyId, staffInfo.getAgencyId()); + orgWrapper.ne(IcPartyOrgEntity::getPartyOrgType, NumConstant.FIVE_STR); + IcPartyOrgEntity orgInfo = icPartyOrgDao.selectOne(orgWrapper); + if (null == orgInfo) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "党组织不存在", "党组织不存在"); + } + IcPartyMemberEntity entity = baseDao.selectById(id); if (null == entity) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "党员不存在", "党员不存在"); @@ -191,6 +206,8 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl