diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/controller/GroupController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/controller/GroupController.java
index 695b4a2..2e5d068 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/controller/GroupController.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/controller/GroupController.java
@@ -110,6 +110,14 @@ public class GroupController {
         return new Result();
     }
 
+    /**
+     * PC端 - 社区教育/兴趣爱好 - 新增兴趣群
+     *
+     * @param dto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author
+     * @date 2020/7/6 09:32
+     */
     @PostMapping("interest")
     public Result saveInterest(@RequestBody GroupDTO dto) {
         //效验数据
@@ -126,6 +134,14 @@ public class GroupController {
         return new Result();
     }
 
+    /**
+     * PC端 - 社区教育/兴趣爱好 - 修改兴趣群
+     *
+     * @param dto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author
+     * @date 2020/7/6 09:32
+     */
     @PutMapping("interest")
     public Result updateInterest(@RequestBody GroupDTO dto) {
         //效验数据
@@ -201,7 +217,7 @@ public class GroupController {
      * @since 2019/11/12 16:10
      */
     @GetMapping("activity")
-    @DataFilter(tableAlias = "gp",  prefix = "AND", isPendingCreator = false)
+    @DataFilter(tableAlias = "gp", prefix = "AND", isPendingCreator = false)
     public Result<PageData<GroupActivityDTO>> pageOfActivity(@RequestParam Map<String, Object> params) {
         PageData<GroupActivityDTO> page = groupService.listGroupOrderByActivity(params);
         return new Result<PageData<GroupActivityDTO>>().ok(page);
@@ -216,7 +232,7 @@ public class GroupController {
      * @since 2019/11/12 16:11
      */
     @GetMapping("member")
-    @DataFilter(tableAlias = "gp",  prefix = "AND", isPendingCreator = false)
+    @DataFilter(tableAlias = "gp", prefix = "AND", isPendingCreator = false)
     public Result<PageData<GroupMemberDTO>> pageOfMember(@RequestParam Map<String, Object> params) {
         PageData<GroupMemberDTO> page = groupService.listGroupOrderByMember(params);
         return new Result<PageData<GroupMemberDTO>>().ok(page);
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/service/impl/GroupServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/service/impl/GroupServiceImpl.java
index 2cc7a70..b52ad9c 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/service/impl/GroupServiceImpl.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/service/impl/GroupServiceImpl.java
@@ -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) {