|
|
@ -27,6 +27,7 @@ import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant; |
|
|
|
import com.elink.esua.epdc.commons.tools.exception.RenException; |
|
|
|
import com.elink.esua.epdc.commons.tools.page.PageData; |
|
|
|
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; |
|
|
|
import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; |
|
|
|
import com.elink.esua.epdc.commons.tools.utils.Result; |
|
|
|
import com.elink.esua.epdc.constant.SysSmsTemplateConstant; |
|
|
|
import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO; |
|
|
@ -36,7 +37,6 @@ import com.elink.esua.epdc.modules.smile.async.IssueOverseeResultsTask; |
|
|
|
import com.elink.esua.epdc.modules.smile.async.NewsTask; |
|
|
|
import com.elink.esua.epdc.modules.smile.feign.AdminFeignClient; |
|
|
|
import com.elink.esua.epdc.modules.smile.feign.EventFeignClient; |
|
|
|
import com.elink.esua.epdc.modules.smile.feign.UserFeignClient; |
|
|
|
import com.elink.esua.epdc.modules.smile.group.dao.GroupDao; |
|
|
|
import com.elink.esua.epdc.modules.smile.group.dao.UserGroupDao; |
|
|
|
import com.elink.esua.epdc.modules.smile.group.entity.GroupEntity; |
|
|
@ -44,7 +44,6 @@ import com.elink.esua.epdc.modules.smile.group.entity.UserGroupEntity; |
|
|
|
import com.elink.esua.epdc.modules.smile.group.service.GroupService; |
|
|
|
import com.elink.esua.epdc.modules.smile.group.service.UserGroupService; |
|
|
|
import com.elink.esua.epdc.modules.smile.rocketmq.dto.OrganizationModifyDTO; |
|
|
|
import com.elink.esua.epdc.modules.smile.topic.service.GroupTopicUserReadService; |
|
|
|
import com.elink.esua.epdc.modules.smile.topic.service.TopicService; |
|
|
|
import com.elink.esua.epdc.smile.dto.constant.GroupConstant; |
|
|
|
import com.elink.esua.epdc.smile.dto.constant.GroupNoticeConstant; |
|
|
@ -83,12 +82,6 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp |
|
|
|
@Autowired |
|
|
|
private AdminFeignClient adminFeignClient; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private GroupTopicUserReadService groupTopicUserReadService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private UserFeignClient userFeignClient; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private IssueOverseeResultsTask issueOverseeResultsTask; |
|
|
|
|
|
|
@ -201,7 +194,7 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public Result saveGroup(GroupCreateFormDTO formDto) { |
|
|
|
// 去掉社群名称中的空白
|
|
|
|
formDto.setGroupName(formDto.getGroupName().replaceAll("\\s*", "")); |
|
|
|
formDto.setGroupName(ModuleUtils.replaceIllegalCharacter(formDto.getGroupName())); |
|
|
|
// 校验社群名称是否已存在
|
|
|
|
Long amount = baseDao.selectListOfRepeatGroupName(formDto.getGridId(), formDto.getGroupName()); |
|
|
|
if (amount > 0) { |
|
|
|