Merge remote-tracking branch 'origin/dev_bugfix_ljj'

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/GetListSocietyOrgFormDTO.java

@@ -57,4 +57,9 @@ public class GetListSocietyOrgFormDTO implements Serializable {
     //token中userId所属组织Id
     private String agencyId;
 
+    /**
+     * resi:居民端
+     */
+    private String app;
+
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java

@@ -142,6 +142,7 @@ public class IcSocietyOrgController implements ResultDataResolver {
     public Result<GetListSocietyOrgResultDTO> getList(@LoginUser TokenDto tokenDto, @RequestBody GetListSocietyOrgFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setStaffId(tokenDto.getUserId());
+        formDTO.setApp(tokenDto.getApp());
         return new Result<GetListSocietyOrgResultDTO>().ok(societyOrgService.getList(formDTO));
     }
 
@@ -171,7 +172,7 @@ public class IcSocietyOrgController implements ResultDataResolver {
         // formDTO.setIsPage(false);
         // GetListSocietyOrgResultDTO list = societyOrgService.getList(formDTO);
         // ExcelUtils.exportExcelToTarget(response, null, list.getList(), IcSocietyOrgExportExcel.class);
-
+        formDTO.setApp(tokenDto.getApp());
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setStaffId(tokenDto.getUserId());
         formDTO.setIsPage(false);

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java

@@ -24,6 +24,7 @@ import com.epmet.commons.tools.constant.MqConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.scan.param.ImgScanParamDTO;
 import com.epmet.commons.tools.scan.param.ImgTaskDTO;
@@ -95,7 +96,7 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiv
     public Result<ResiActLiveRecResultDTO> liveRecList(TokenDto tokenDto,Map<String, String> map) {
         if (!map.containsKey("actId") || StringUtils.isEmpty(map.get("actId"))) {
             logger.warn("传参中没有actId,或者actId为空,userId:" + tokenDto.getUserId() + "客户id:" + tokenDto.getCustomerId());
-            throw new RenException("actId不能为空");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"actId不能为空","活动id不能为空");
         }
         // 数据汇总
         ResiActLiveRecResultDTO resultDto = new ResiActLiveRecResultDTO();

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java

@@ -19,6 +19,7 @@ package com.epmet.service.impl;
 
 import com.alibaba.excel.EasyExcel;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
@@ -148,10 +149,10 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl<IcSocietyOrgDao, Ic
     @Override
     public GetListSocietyOrgResultDTO getList(GetListSocietyOrgFormDTO formDTO) {
         GetListSocietyOrgResultDTO resultDTO = new GetListSocietyOrgResultDTO();
-        CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
         //2022.1.7 应产品要求 当前组织只能看到自己组织添加的社会组织数据，不允许看其他下级的
         //formDTO.setPids(staffInfoCache.getAgencyPIds());
-        if(StringUtils.isBlank(formDTO.getAgencyId())){
+        if (StringUtils.isBlank(formDTO.getAgencyId()) && !AppClientConstant.APP_RESI.equals(formDTO.getApp())) {
+            CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
             formDTO.setAgencyId(staffInfoCache.getAgencyId());
         }
         //1.根据查询条件分页查询社会组织数据

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java

@@ -24,6 +24,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import javax.annotation.PostConstruct;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -46,6 +47,12 @@ public class TagServiceImpl implements TagService {
     @Autowired
     private ArticlePublishRangeDao articlePublishRangeDao;
 
+    @PostConstruct
+    public void initDataToRedis(){
+        //加载党建声音标签到redis
+        this.initTag(new InitTagFormDTO());
+    }
+
     /**
      * @Description  已发布列表页的标签——政府端
      * @param tokenDto

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerFootBarFormDTO.java

@@ -44,7 +44,7 @@ public class CustomerFootBarFormDTO {
     @NotBlank(message = "FootBar的ID不能为空", groups = { UpdateFootBarGroup.class, FootBarDetailGroup.class, UpdateDisplayStatusGroup.class, DeleteFootbarsGroup.class })
     private String id;
 
-    @NotBlank(message = "客户ID不能为空", groups = { CreateFootBarGroup.class, AddDefaultFootbars4Customer.class, ListFootBarGroup4Oper.class , DeleteFootbarsGroup.class})
+    @NotBlank(message = "客户ID不能为空", groups = { ListFootBarGroup.class,CreateFootBarGroup.class, AddDefaultFootbars4Customer.class, ListFootBarGroup4Oper.class , DeleteFootbarsGroup.class})
     private String customerId;
 
     // 哪一个端:gov,resi

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -1346,6 +1346,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		List<AchievementDetailResultDTO.AchievementBean> achievementList = new ArrayList<>();
 		//1.小组创建时间
 		ResiGroupEntity group =  baseDao.selectById(formDTO.getGroupId());
+		if (null == group) {
+			throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "resi_group is null groupId:" + formDTO.getGroupId(), "小组不存在");
+		}
 		resultDTO.setCreatedDate(DateUtils.dateToTimestamp(group.getCreatedTime()));
 
 		//2.即将完成的3个成就

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartymemberStyleDTO.java

@@ -19,6 +19,7 @@ package com.epmet.resi.partymember.dto.partymember;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -34,10 +35,11 @@ import java.util.List;
 public class IcPartymemberStyleDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
-
+    public interface DetailGroup {}
     /**
-     * 楼栋主键
+     * 主键
      */
+    @NotBlank(message = "党员风采主键不能为空",groups = DetailGroup.class)
 	private String id;
 
     /**

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java

@@ -84,6 +84,7 @@ public class IcPartymemberStyleController {
 
     @PostMapping("detail")
     public Result<IcPartymemberStyleDTO> get(@RequestBody IcPartymemberStyleDTO dto) {
+        ValidatorUtils.validateEntity(dto,IcPartymemberStyleDTO.DetailGroup.class);
         IcPartymemberStyleDTO data = icPartymemberStyleService.get(dto.getId());
         return new Result<IcPartymemberStyleDTO>().ok(data);
     }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java

@@ -156,6 +156,9 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
     @Override
     public IcPartymemberStyleDTO get(String id) {
         IcPartymemberStyleEntity entity = baseDao.selectById(id);
+        if (null == entity) {
+            throw  new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"ic_partymember_style is null id:"+id,"没有找到党员风采记录");
+        }
         IcPartymemberStyleDTO dto = ConvertUtils.sourceToTarget(entity, IcPartymemberStyleDTO.class);
         dto.setImageList(icPartymemberStyleImageService.getByStyleId(id));
         GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(dto.getGridId());

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

@@ -312,13 +312,19 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     if (formMap.containsKey("ic_party_member")) {
                         for (LinkedHashMap<String, String> hash : formMap.get("ic_party_member")) {
                             if (!hash.containsKey("SSZB")) {
-                                String errorMsg = "党员信息所属支部不能为空";
+                                // 10.26灵山卫的暂时放开，不校验
-                                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
+                                if(!"57eaadaab264b816e7159c1a91ac50c1".equals(tokenDto.getCustomerId())){
+                                    String errorMsg = "党员信息所属支部不能为空";
+                                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
+                                }
                             }
                         }
                     } else {
-                        String errorMsg = "党员信息所属支部不能为空";
+                        // 10.26灵山卫的暂时放开，不校验
-                        throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
+                        if(!"57eaadaab264b816e7159c1a91ac50c1".equals(tokenDto.getCustomerId())){
+                            String errorMsg = "党员信息所属支部不能为空";
+                            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
+                        }
                     }
 
                     partyMemberDTO.setCustomerId(tokenDto.getCustomerId());
@@ -541,20 +547,29 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     if (formMap.containsKey("ic_party_member")) {
                         for (LinkedHashMap<String, String> hash : formMap.get("ic_party_member")) {
                             if (!hash.containsKey("ID") && !hash.containsKey("SSZB")) {
-                                String errorMsg = "党员信息所属支部不能为空";
+                                // 10.26灵山卫的暂时放开，不校验
-                                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
+                                if(!"57eaadaab264b816e7159c1a91ac50c1".equals(tokenDto.getCustomerId())){
+                                    String errorMsg = "党员信息所属支部不能为空";
+                                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
+                                }
                             }
                         }
                     } else {
-                        String errorMsg = "党员信息所属支部不能为空";
+                        // 10.26灵山卫的暂时放开，不校验
-                        throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
+                        if(!"57eaadaab264b816e7159c1a91ac50c1".equals(tokenDto.getCustomerId())){
+                            String errorMsg = "党员信息所属支部不能为空";
+                            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
+                        }
                     }
                 } else if (!map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(icResiUser.getIsParty())) {
                     if (formMap.containsKey("ic_party_member")) {
                         for (LinkedHashMap<String, String> hash : formMap.get("ic_party_member")) {
                             if (!hash.containsKey("ID") && !hash.containsKey("SSZB")) {
-                                String errorMsg = "党员信息所属支部不能为空";
+                                // 10.26灵山卫的暂时放开，不校验
-                                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
+                                if(!"57eaadaab264b816e7159c1a91ac50c1".equals(tokenDto.getCustomerId())){
+                                    String errorMsg = "党员信息所属支部不能为空";
+                                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
+                                }
                             }
                         }
                     }