Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aop/NoRepeatSubmitAop.java

@@ -35,41 +35,35 @@ public class NoRepeatSubmitAop {
     private DistributedLock distributedLock;
 
     @Around("@annotation(noRepeatSubmit)")
-    public Object around(ProceedingJoinPoint pjp, NoRepeatSubmit noRepeatSubmit) {
+    public Object around(ProceedingJoinPoint pjp, NoRepeatSubmit noRepeatSubmit) throws Throwable {
 
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        assert attributes != null;
+        HttpServletRequest request = attributes.getRequest();
+        String internalToken = request.getHeader(AUTHORIZATION_TOKEN_HEADER_KEY);
+        String key = getKey(request.getRequestURI(), internalToken);
+        // 如果缓存中有这个url视为重复提交
+        Object result = null;
+        RLock lock = null;
         try {
-            ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+            long leaseTime = noRepeatSubmit.leaseTime();
-            assert attributes != null;
+            //如果获取不到锁等待0秒直接返回 持锁时间为leaseTime
-            HttpServletRequest request = attributes.getRequest();
+            lock = distributedLock.getLock(RedisKeys.getNoRepeatSubmitKey(key), leaseTime, NumConstant.ZERO_L, TimeUnit.MILLISECONDS);
-            String internalToken = request.getHeader(AUTHORIZATION_TOKEN_HEADER_KEY);
+        } catch (Exception e) {
-            String key = getKey(request.getRequestURI(), internalToken);
+            log.warn("noRepeatSubmit key:{},msg:{}", key, e.getMessage());
-            // 如果缓存中有这个url视为重复提交
+            //"未获取到锁，重复提交了
-            Object result = null;
+            throw new RenException(EpmetErrorCode.REPEAT_SUBMIT.getCode());
-            RLock lock = null;
+        }
-            try {
+        try {
-                long leaseTime = noRepeatSubmit.leaseTime();
+            //因为getLock如果获取失败抛异常 所以不做锁状态的判断
-                //如果获取不到锁等待0秒直接返回 持锁时间为leaseTime
+            result = pjp.proceed();
-                lock = distributedLock.getLock(RedisKeys.getNoRepeatSubmitKey(key), leaseTime, NumConstant.ZERO_L, TimeUnit.MILLISECONDS);
+        } finally {
-            } catch (Exception e) {
+            distributedLock.unLock(lock);
-                log.warn("noRepeatSubmit key:{},msg:{}", key, e.getMessage());
+        }
-                //"未获取到锁，重复提交了
-                throw new RenException(EpmetErrorCode.REPEAT_SUBMIT.getCode());
-            }
-            try {
-                //因为getLock如果获取失败抛异常 所以不做锁状态的判断
-                result = pjp.proceed();
-            } finally {
-                distributedLock.unLock(lock);
-            }
 
 
-            return result;
+        return result;
-        } catch (RenException e) {
+
-            throw e;
-        } catch (Throwable e) {
-            log.error("验证重复提交时出现未知异常!");
-            throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
-        }
     }
 
     private String getKey(String keyExpress, String token) {

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/RoleListFormDTO.java

@@ -0,0 +1,28 @@
+package com.epmet.dataaggre.dto.epmetuser.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/8/27 10:40
+ */
+@Data
+public class RoleListFormDTO implements Serializable {
+    private static final long serialVersionUID = -3331980620366027460L;
+    /**
+     * 客户ID
+     */
+    private String customerId;
+    /**
+     * 是否包括我（1 是，0 否）
+     */
+    private String includeMe;
+    /**
+     * 用户ID
+     */
+    private String userId;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/RoleUsersFormDTO.java

@@ -16,4 +16,12 @@ public class RoleUsersFormDTO implements Serializable {
     @NotBlank(message = "角色ID不能为空")
     private String roleId;
     private String customerId;
+    /**
+     * 是否包括我（1 是，0 否）
+     */
+    private String includeMe;
+    /**
+     * 用户ID
+     */
+    private String userId;
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/OrgStaffListFormDTO.java

@@ -35,10 +35,16 @@ public class OrgStaffListFormDTO implements Serializable {
      */
     @Min(value = 1, message = "每页条数必须大于0", groups = OrgStaffListFormDTO.OrgStaff.class)
     private Integer pageSize = 10;
+    /**
+     * 是否包括我（1 是，0 否）默认值1
+     */
+    private String includeMe = "1";
     //客户Id
     private String customerId;
     //工作人员id集合
     private List<String> staffIds;
+    //token中用户Id
+    private String staffId;
     public interface OrgStaff extends CustomerClientShowGroup {}
 
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/ReceiversFormDTO.java

@@ -16,7 +16,9 @@ public class ReceiversFormDTO implements Serializable {
     private String infoId;
     private Integer pageNo = 1;
     private Integer pageSize = 10;
+    /**
+     * 1: 已读，0: 未读
+     */
     private String readFlag;
 
-
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/SubOrgFormDTO.java

@@ -15,4 +15,12 @@ public class SubOrgFormDTO implements Serializable {
     private static final long serialVersionUID = -3651225675593357002L;
     @NotBlank(message = "组织ID不能为空")
     private String agencyId;
+    /**
+     * 是否包括我（1 是，0 否）
+     */
+    private String includeMe;
+    /**
+     * 用户ID
+     */
+    private String userId;
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java

@@ -238,6 +238,7 @@ public class EpmetUserController {
     public Result<List<RoleUsersResultDTO>> roleUsers(@LoginUser TokenDto tokenDto, @RequestBody RoleUsersFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
         return new Result<List<RoleUsersResultDTO>>().ok(epmetUserService.getRoleUsers(formDTO));
 
     }
@@ -250,8 +251,11 @@ public class EpmetUserController {
      * @Date 2021/8/19 15:10
      */
     @PostMapping("rolelist")
-    public Result<List<RoleListResultDTO>> roleList(@LoginUser TokenDto tokenDto) {
+    public Result<List<RoleListResultDTO>> roleList(@LoginUser TokenDto tokenDto, @RequestBody RoleListFormDTO formDTO) {
-        return new Result<List<RoleListResultDTO>>().ok(epmetUserService.getRoleList(tokenDto.getCustomerId()));
+        ValidatorUtils.validateEntity(formDTO);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        return new Result<List<RoleListResultDTO>>().ok(epmetUserService.getRoleList(formDTO));
 
     }
 

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java

@@ -136,6 +136,7 @@ public class GovOrgController {
             throw new RenException("参数类型错误");
         }
         formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
         return new Result<OrgStaffListResultDTO>().ok(govOrgService.staffList(formDTO));
     }
 
@@ -158,8 +159,9 @@ public class GovOrgController {
      * @Date 2021/8/19 15:13
      */
     @PostMapping("suborg")
-    public Result<SubOrgResultDTO> subOrg(@RequestBody SubOrgFormDTO formDTO) {
+    public Result<SubOrgResultDTO> subOrg(@LoginUser TokenDto tokenDto, @RequestBody SubOrgFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
+        formDTO.setUserId(tokenDto.getUserId());
         return new Result<SubOrgResultDTO>().ok(govOrgService.getSubOrg(formDTO));
     }
 

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StaffRoleDao.java

@@ -62,7 +62,7 @@ public interface StaffRoleDao extends BaseDao<StaffRoleEntity> {
      * @Author zhaoqifeng
      * @Date 2021/8/19 17:16
      */
-    List<RoleListResultDTO> getRoleCountList(@Param("customerId") String customerId);
+    List<RoleListResultDTO> getRoleCountList(@Param("customerId") String customerId, @Param("userId") String userId);
 
     /**
      * @Description 根据角色查询人员列表
@@ -72,6 +72,6 @@ public interface StaffRoleDao extends BaseDao<StaffRoleEntity> {
      * @Author zhaoqifeng
      * @Date 2021/8/26 16:48
      */
-    List<StaffRoleEntity> selectStaffByRole(@Param("customerId") String customerId, @Param("roleId") String roleId);
+    List<StaffRoleEntity> selectStaffByRole(@Param("customerId") String customerId, @Param("roleId") String roleId, @Param("userId") String userId);
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerStaffAgencyDao.java

@@ -69,6 +69,6 @@ public interface CustomerStaffAgencyDao extends BaseDao<CustomerStaffAgencyEntit
      * @Author zhaoqifeng
      * @Date 2021/8/20 14:08
      */
-    List<OrgDTO> selectSubAgency(@Param("agencyId") String agencyId);
+    List<OrgDTO> selectSubAgency(@Param("agencyId") String agencyId, @Param("userId") String userId);
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerStaffDepartmentDao.java

@@ -50,5 +50,5 @@ public interface CustomerStaffDepartmentDao extends BaseDao<CustomerStaffDepartm
      * @Author zhaoqifeng
      * @Date 2021/8/20 14:29
      */
-    List<OrgDTO> selectDepartmentList(@Param("agencyId") String agencyId);
+    List<OrgDTO> selectDepartmentList(@Param("agencyId") String agencyId, @Param("userId") String userId);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerStaffGridDao.java

@@ -55,5 +55,5 @@ public interface CustomerStaffGridDao extends BaseDao<CustomerStaffGridEntity> {
      * @Author zhaoqifeng
      * @Date 2021/8/20 14:37
      */
-    List<OrgDTO> selectGridList(@Param("agencyId") String agencyId);
+    List<OrgDTO> selectGridList(@Param("agencyId") String agencyId, @Param("userId") String userId);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java

@@ -63,7 +63,7 @@ public class EpmetMessageServiceImpl implements EpmetMessageService {
         //检索已读/未读人员列表，并分页
         LambdaQueryWrapper<InfoReceiversEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(InfoReceiversEntity :: getInfoId, formDTO.getInfoId());
-        wrapper.eq(StringUtils.isNotBlank(formDTO.getReadFlag()), InfoReceiversEntity :: getReadFlag, NumConstant.ONE_STR.equals(formDTO.getReadFlag()));
+        wrapper.eq(StringUtils.isNotBlank(formDTO.getReadFlag()), InfoReceiversEntity :: getReadFlag, Integer.valueOf(formDTO.getReadFlag()));
         Page<InfoReceiversEntity> page = new Page<>(formDTO.getPageNo(), formDTO.getPageSize());
         IPage<InfoReceiversEntity> iPage = infoReceiversDao.selectPage(page, wrapper);
         List<InfoReceiversEntity> list = iPage.getRecords();

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java

@@ -116,12 +116,12 @@ public interface EpmetUserService {
 
     /**
      * @Description 获取角色列表
-     * @Param customerId
+     * @Param formDTO
      * @Return {@link List<RoleListResultDTO>}
      * @Author zhaoqifeng
      * @Date 2021/8/19 15:09
      */
-    List<RoleListResultDTO> getRoleList(String customerId);
+    List<RoleListResultDTO> getRoleList(RoleListFormDTO formDTO);
 
     /**
      * desc:根据工作人员Id 获取工作人员全部信息

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -477,7 +477,11 @@ public class EpmetUserServiceImpl implements EpmetUserService {
      */
     @Override
     public List<RoleUsersResultDTO> getRoleUsers(RoleUsersFormDTO formDTO) {
-        List<StaffRoleEntity> staffRoleList = staffRoleDao.selectStaffByRole(formDTO.getCustomerId(), formDTO.getRoleId());
+        String userId = null;
+        if (NumConstant.ZERO_STR.equals(formDTO.getIncludeMe())) {
+            userId = formDTO.getUserId();
+        }
+        List<StaffRoleEntity> staffRoleList = staffRoleDao.selectStaffByRole(formDTO.getCustomerId(), formDTO.getRoleId(), userId);
         if (CollectionUtils.isEmpty(staffRoleList)) {
             return Collections.emptyList();
         }
@@ -499,7 +503,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
     }
 
     /**
-     * @param customerId
+     * @param formDTO
      * @Description 获取角色列表
      * @Param customerId
      * @Return {@link List<RoleListResultDTO>}
@@ -507,14 +511,18 @@ public class EpmetUserServiceImpl implements EpmetUserService {
      * @Date 2021/8/19 15:09
      */
     @Override
-    public List<RoleListResultDTO> getRoleList(String customerId) {
+    public List<RoleListResultDTO> getRoleList(RoleListFormDTO formDTO) {
         //获取角色列表
         LambdaQueryWrapper<GovStaffRoleEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(GovStaffRoleEntity :: getCustomerId, customerId);
+        wrapper.eq(GovStaffRoleEntity :: getCustomerId, formDTO.getCustomerId());
         wrapper.orderByAsc(GovStaffRoleEntity ::getSort);
         List<GovStaffRoleEntity> list = govStaffRoleDao.selectList(wrapper);
         //获取角色人数
-        List<RoleListResultDTO> countList = staffRoleDao.getRoleCountList(customerId);
+        String userId = null;
+        if (NumConstant.ZERO_STR.equals(formDTO.getIncludeMe())) {
+            userId = formDTO.getUserId();
+        }
+        List<RoleListResultDTO> countList = staffRoleDao.getRoleCountList(formDTO.getCustomerId(), userId);
         Map<String, Integer> map = new HashMap<>();
         if (CollectionUtils.isNotEmpty(countList)) {
             map = countList.stream().collect(Collectors.toMap(RoleListResultDTO :: getRoleId, RoleListResultDTO :: getStaffNum));

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -393,6 +393,10 @@ public class GovOrgServiceImpl implements GovOrgService {
             return resultDTO;
         }
         formDTO.setStaffIds(staffIds);
+        //是否包含自己
+        if("0".equals(formDTO.getIncludeMe())){
+            staffIds.removeIf(s->s.equals(formDTO.getStaffId()));
+        }
 
         //2.分页查询工作人员基础信息、角色信息【组织人员单位领导角色人员在前；部门人员部门领导角色人员在前；网格人员网格长角色人员在前】
         List<ListStaffResultDTO> staffList = epmetUserService.getStaffInfoList(formDTO);
@@ -442,12 +446,16 @@ public class GovOrgServiceImpl implements GovOrgService {
      */
     @Override
     public SubOrgResultDTO getSubOrg(SubOrgFormDTO formDTO) {
+        String userId = null;
+        if (NumConstant.ZERO_STR.equals(formDTO.getIncludeMe())) {
+            userId = formDTO.getUserId();
+        }
         //下级组织列表
-        List<OrgDTO> subAgencyList = customerStaffAgencyDao.selectSubAgency(formDTO.getAgencyId());
+        List<OrgDTO> subAgencyList = customerStaffAgencyDao.selectSubAgency(formDTO.getAgencyId(), userId);
         //下级部门列表
-        List<OrgDTO> departmentList = customerStaffDepartmentDao.selectDepartmentList(formDTO.getAgencyId());
+        List<OrgDTO> departmentList = customerStaffDepartmentDao.selectDepartmentList(formDTO.getAgencyId(), userId);
         //下级网格列表
-        List<OrgDTO> gridList = customerStaffGridDao.selectGridList(formDTO.getAgencyId());
+        List<OrgDTO> gridList = customerStaffGridDao.selectGridList(formDTO.getAgencyId(), userId);
         SubOrgResultDTO result = new SubOrgResultDTO();
         result.setSubAgencyList(subAgencyList);
         result.setDepartmentList(departmentList);

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml

@@ -99,6 +99,7 @@
                         ORDER BY SUM(ssp.total_time) DESC
                     </otherwise>
                 </choose>
+                , ssp.staff_id DESC
             </if>
             LIMIT
             #{pageNo}, #{pageSize}

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffRoleDao.xml

@@ -66,7 +66,11 @@
         FROM
                 staff_role
         WHERE
-                CUSTOMER_ID = #{customerId}
+                DEL_FLAG = '0'
+                AND CUSTOMER_ID = #{customerId}
+        <if test='null != userId and "" != userId'>
+            AND STAFF_ID != #{userId}
+        </if>
         GROUP BY
                 ROLE_ID
     </select>
@@ -85,5 +89,8 @@
           AND a.CUSTOMER_ID = #{customerId}
           AND b.CUSTOMER_ID = #{customerId}
           AND b.ROLE_ID = #{roleId}
+        <if test='null != userId and "" != userId'>
+            AND b.STAFF_ID != #{userId}
+        </if>
     </select>
 </mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml

@@ -108,6 +108,9 @@
                         AND b.DEL_FLAG = '0'
         WHERE
                 a.DEL_FLAG = '0'
+        <if test='null != userId and "" != userId'>
+            AND b.USER_ID != #{userId}
+        </if>
         ) csa ON csa.PIDS LIKE CONCAT( '%', ca.ID, '%' )
         WHERE
                 ca.DEL_FLAG = '0'

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffDepartmentDao.xml

@@ -25,6 +25,9 @@
             customer_department cd
         LEFT JOIN customer_staff_department csd ON cd.ID = csd.DEPARTMENT_ID
         AND csd.DEL_FLAG = '0'
+        <if test='null != userId and "" != userId'>
+            AND csd.USER_ID != #{userId}
+        </if>
         WHERE
             cd.DEL_FLAG = '0'
         AND cd.AGENCY_ID = #{agencyId}

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffGridDao.xml

@@ -45,6 +45,9 @@
                 customer_grid cg
                         LEFT JOIN customer_staff_grid csg ON cg.ID = csg.GRID_ID
                         AND csg.DEL_FLAG = '0'
+        <if test='null != userId and "" != userId'>
+            AND csg.USER_ID != #{userId}
+        </if>
         WHERE
                 cg.DEL_FLAG = 0
           AND cg.PID = #{agencyId}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java

@@ -1,7 +1,9 @@
 package com.epmet.dto.screencoll.form;
 
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -17,46 +19,57 @@ public class PartyBranchDataFormDTO implements Serializable {
     /**
      * 年Id ：yyyy
      */
+    @NotBlank(message = "yearId不能为空")
+    @Length(max = 4,message = "yyyy")
     private String yearId;
 
     /**
      * 月份Id ：yyyyMM
      */
+    @NotBlank(message = "monthId不能为空")
+    @Length(max = 6,message = "格式：yyyyMM")
     private String monthId;
 
     /**
      * 数据类别 party:支部建设;union:联合建设党员志愿服务：voluntaryservice
      */
+    @NotBlank(message = "type不能为空")
     private String type;
 
     /**
      * 组织类别 agency：组织；部门：department；网格：grid
      */
+    @NotBlank(message = "orgType不能为空")
     private String orgType;
 
     /**
      * 组织Id 可以为网格，机关id
      */
+    @NotBlank(message = "orgId不能为空")
     private String orgId;
 
     /**
      * 上级组织Id
      */
+    @NotBlank(message = "parentId不能为空")
     private String parentId;
 
     /**
      * 组织名称
      */
+    @NotBlank(message = "orgName不能为空")
     private String orgName;
 
     /**
      * 会议分类名称
      */
+    @NotBlank(message = "meetCategoryName不能为空")
     private String meetCategoryName;
 
     /**
      * 会议分类id
      */
+    @NotBlank(message = "meetCategoryId不能为空")
     private String meetCategoryId;
 
     /**

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataListFormDTO.java

@@ -1,7 +1,12 @@
 package com.epmet.dto.screencoll.form;
 
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 
@@ -18,12 +23,17 @@ public class PartyBranchDataListFormDTO implements Serializable {
     /**
      * 当为true时后台将删除本月数据
      */
+    @NotNull(message = "isFirst不能为空")
     private Boolean isFirst;
 
     /**
      * yyyyMM
      */
+    @NotBlank(message = "monthId不能为空")
+    @Length(max = 6,message = "格式：yyyyMM")
     private String monthId;
 
+    @Valid
+    @NotEmpty(message = "数据集合不能为空")
     private List<PartyBranchDataFormDTO> dataList;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/external/ShiBeiScreenCollController.java

@@ -1,6 +1,7 @@
 package com.epmet.controller.external;
 
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.indexcollect.form.CustomerBizOrgFormDTO;
 import com.epmet.dto.screencoll.form.*;
 import com.epmet.service.evaluationindex.screen.ShiBeiScreenCollService;
@@ -59,6 +60,7 @@ public class ShiBeiScreenCollController {
      **/
     @PostMapping("meetdata")
     public Result meetData(@RequestHeader("CustomerId") String customerId, @RequestBody PartyBranchDataListFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
         shiBeiScreenCollService.insertPartyBranchData(formDTO, customerId);
         return new Result();
     }

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java

@@ -0,0 +1,24 @@
+package com.epmet.constant;
+
+
+/**
+ * @author yinzuomei
+ * @dscription
+ * @date 2021/08/27 14:22
+ */
+public interface UserMessageTypeConstant {
+
+    //上传下达
+    /**
+     * 工作端发送消息,通知接收人
+     */
+    String INFO="info";
+
+    /**
+     * 居民端提交热心居民申请，通知网格长
+     */
+    String WARMHEARTED_APPLY="warmhearted_apply";
+
+
+
+}

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/constant/UserMessageConstans.java

@@ -20,6 +20,5 @@ public interface UserMessageConstans {
 
 	String INFO_TITLE="您有一条新消息";
 
-	String MESSAGE_TYPE_INFO="info";
 	String INFO_CONTENT_TEMP="您有一条【%s】的新消息，请您查看";
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/InfoGroupReceiversDao.java

@@ -20,6 +20,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.InfoGroupReceiversEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Set;
 
@@ -40,5 +41,5 @@ public interface InfoGroupReceiversDao extends BaseDao<InfoGroupReceiversEntity>
      * @author yinzuomei
      * @date 2021/8/19 10:51 上午
      */
-    Set<String> selectStaffIds(Set<String> groupIdList);
+    Set<String> selectStaffIds(@Param("groupIdList") Set<String> groupIdList);
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java

@@ -27,6 +27,7 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.UserMessageConstans;
+import com.epmet.constant.UserMessageTypeConstant;
 import com.epmet.dao.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.AddReceiverGroupResultDTO;
@@ -159,7 +160,7 @@ public class InfoServiceImpl extends BaseServiceImpl<InfoDao, InfoEntity> implem
                     infoEntity.getContent().length() > NumConstant.FIFTY ?
                             StringUtils.substring(infoEntity.getContent(), NumConstant.ZERO,NumConstant.FORTY_NINE) : infoEntity.getContent()));
             userMessageEntity.setReadFlag(UserMessageConstans.UNREAD);
-            userMessageEntity.setMessageType(UserMessageConstans.MESSAGE_TYPE_INFO);
+            userMessageEntity.setMessageType(UserMessageTypeConstant.INFO);
             userMessageEntity.setTargetId(infoEntity.getId());
             userMessageEntity.setCreatedBy(formDTO.getUserId());
             userMessageEntity.setUpdatedBy(formDTO.getUserId());

epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/InfoGroupReceiversDao.xml

@@ -11,9 +11,13 @@
             info_group_receivers igr
         WHERE
             igr.DEL_FLAG = '0'
-          AND igr.info_receiver_group_id IN (
+        <if test="groupIdList != null and groupIdList.size() > 0">
-                                             '1','2'
+            AND igr.info_receiver_group_id IN
+            <foreach collection="groupIdList" item="groupId" separator="," open="(" close=")">
+                #{groupId}
+            </foreach>
             )
+        </if>
     </select>
 
 

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java

@@ -55,4 +55,8 @@ public class MineResultDTO implements Serializable {
 	 * 手机号
 	 */
 	private String mobile;
+	/**
+	 * 根组织
+	 */
+	private String rootAgencyId;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java

@@ -1,6 +1,7 @@
 package com.epmet.service.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
@@ -229,6 +230,15 @@ public class StaffServiceImpl implements StaffService {
 			//用户所属机关名称
 			result.setMyAgencyName(customerAgencyDTO.getOrganizationName());
 		}
+		//2021.08.27 zhaoqf start
+		//获取根组织
+		CustomerAgencyDTO agency = customerAgencyService.get(customerStaffAgency.getAgencyId());
+		if (StringUtils.isNotBlank(agency.getPids())) {
+			result.setRootAgencyId(agency.getPids().split(StrConstant.COLON)[0]);
+		} else {
+			result.setRootAgencyId(customerStaffAgency.getAgencyId());
+		}
+		//2021.08.27 zhaoqf end
 		return result;
 	}
 

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml

@@ -47,9 +47,9 @@
         </if>
         )t
         LEFT JOIN resi_event_attachment rea
-        ON (rea.RESI_EVENT_ID = t.eventId)
+        ON (rea.RESI_EVENT_ID = t.eventId
-        where  rea.DEL_FLAG = '0'
+        and rea.DEL_FLAG = '0'
-        AND rea.ATTACHMENT_TYPE = 'image'
+        AND rea.ATTACHMENT_TYPE = 'image')
         <if test='eventType == "undisposed" '>
             ORDER BY t.eventTime,rea.sort asc
         </if>