Merge remote-tracking branch 'remotes/origin/dev_party_mange'

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())) {

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;
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVolunteerPolyServiceImpl.java

@@ -256,8 +256,6 @@ public class IcVolunteerPolyServiceImpl extends BaseServiceImpl<IcVolunteerPolyD
                     IcVolunteerPolyCategoryEntity category = new IcVolunteerPolyCategoryEntity();
                     category.setCustomerId(item.getCustomerId());
                     category.setIdCard(item.getIdCard());
-                    category.setLatitude(item.getLatitude());
-                    category.setLongitude(item.getLongitude());
                     category.setVolunteerCategory(o);
                     return category;
                 }).collect(Collectors.toList());
@@ -346,10 +344,6 @@ public class IcVolunteerPolyServiceImpl extends BaseServiceImpl<IcVolunteerPolyD
                         IcVolunteerPolyCategoryEntity category = new IcVolunteerPolyCategoryEntity();
                         category.setCustomerId(entity.getCustomerId());
                         category.setIdCard(entity.getIdCard());
-                        if (null != volunteer) {
-                            category.setLatitude(volunteer.getLatitude());
-                            category.setLongitude(volunteer.getLongitude());
-                        }
                         category.setVolunteerCategory(o);
                         return category;
                     }).collect(Collectors.toList());
@@ -387,10 +381,6 @@ public class IcVolunteerPolyServiceImpl extends BaseServiceImpl<IcVolunteerPolyD
                     IcVolunteerPolyCategoryEntity category = new IcVolunteerPolyCategoryEntity();
                     category.setCustomerId(entity.getCustomerId());
                     category.setIdCard(entity.getIdCard());
-                    if (null != volunteer) {
-                        category.setLatitude(volunteer.getLatitude());
-                        category.setLongitude(volunteer.getLongitude());
-                    }
                     category.setVolunteerCategory("dangyuanzhongxinhu");
                     icVolunteerPolyCategoryDao.delete(categoryWrapper);
                     icVolunteerPolyCategoryService.insert(category);

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.51__ic_volunteer_poly_category.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `epmet_user`.`ic_volunteer_poly_category`
+DROP COLUMN `LONGITUDE`,
+DROP COLUMN `LATITUDE`;

epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyCategoryDao.xml

@@ -8,8 +8,6 @@
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="idCard" column="ID_CARD"/>
         <result property="volunteerCategory" column="VOLUNTEER_CATEGORY"/>
-        <result property="longitude" column="LONGITUDE"/>
-        <result property="latitude" column="LATITUDE"/>
         <result property="revision" column="REVISION"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="updatedBy" column="UPDATED_BY"/>