社区用户推送

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java

@@ -150,4 +150,6 @@ public interface SysUserDao extends BaseDao<SysUserEntity> {
      * @since 2021/8/28 22:18
      */
     List<EpdcAppGridManListResultDTO> selectListGridmanInfo(EpdcAppGridManFormDTO formDto);
+
+    List<SysUserDTO> getIsGridLeaderByUserId(@Param("userId") Long userId);
 }

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java

@@ -380,11 +380,14 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
      * @date 2022/12/9 04:56
      */
     private void sendInfo(SysUserDTO dto, SysUserEntity entity, int type) {
+        // 校验是否包含网格长角色
+        List<SysUserDTO> sysUserDTOS = baseDao.getIsGridLeaderByUserId(entity.getId());
+        if(sysUserDTOS != null && sysUserDTOS.size() > 0){
             try {
                 // 获取网格的ManageId
                 SysDeptInfoResultDTO sysDeptInfoResultDTO = sysDeptInfoService.getSysDeptInfo(entity.getDeptId().toString());
                 if (type == NumConstant.ZERO) {
-                if(sysDeptInfoResultDTO.getGridManageId() != null && sysDeptInfoResultDTO.getCommunityManageId() != null){
+                    if(sysDeptInfoResultDTO.getGridManageId() != null){
                         ManageUserAddFormDTO userAddFormDTO = new ManageUserAddFormDTO();
                         userAddFormDTO.setGridId(sysDeptInfoResultDTO.getGridManageId());
                         userAddFormDTO.setUserName(entity.getUsername());
@@ -439,6 +442,8 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
             }
         }
 
+    }
+
     /**
      * 设置ManageId
      * @param result

epdc-cloud-admin/src/main/resources/mapper/SysUserDao.xml

@@ -235,4 +235,15 @@
             eur.CREATED_TIME DESC
         LIMIT #{pageIndex}, #{pageSize}
     </select>
+    <select id="getIsGridLeaderByUserId" parameterType="java.lang.Long" resultType="com.elink.esua.epdc.dto.SysUserDTO">
+        select
+            user.*
+        from sys_user user
+        left join sys_role_user ru on ru.user_id = user.ID
+        left join sys_role r on r.Id = ru.role_id and r.del_flag = 0
+        where user.del_flag = 0
+        and user.status = 1
+        and r.type_key = 'gridLeader'
+        and user.ID = #{userId}
+    </select>
 </mapper>