党员相关bug修改

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<IcPartyMemberDTO> get(@PathVariable("id") String id){
-        IcPartyMemberDTO data = icPartyMemberService.get(id);
+    public Result<IcPartyMemberDTO> get(@LoginUser TokenDto tokenDto, @PathVariable("id") String id){
+        IcPartyMemberDTO data = icPartyMemberService.get(tokenDto, id);
         return new Result<IcPartyMemberDTO>().ok(data);
     }
     @NoRepeatSubmit

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<IcPartyMemberEntity> {
      * @author generator
      * @date 2022-05-17
      */
-    IcPartyMemberDTO get(String id);
+    IcPartyMemberDTO get(TokenDto tokenDto, String id);
 
     /**
      * 默认保存

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<IcPartyMemberDao,
     }
 
     @Override
-    public IcPartyMemberDTO get(String id) {
+    public IcPartyMemberDTO get(TokenDto tokenDto, String id) {
+
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+        if (null == staffInfo) {
+            throw new EpmetException("获取工作人员信息失败");
+        }
+        //获取工作人员所属组织同级的党组织
+        LambdaQueryWrapper<IcPartyOrgEntity> 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<IcPartyMemberDao,
             } else {
                 dto.setOrgPids(dto.getOrgPids().concat(StrConstant.COLON).concat(dto.getSszb()));
             }
+            int index = dto.getOrgPids().lastIndexOf(orgInfo.getId());
+            dto.setOrgPids(dto.getOrgPids().substring(index));
         }
         //职务
         if (StringUtils.isNotBlank(dto.getPartyZw())) {