diff --git a/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridRelationService.java b/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridRelationService.java index 380f4140..2b67f9c3 100644 --- a/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridRelationService.java +++ b/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridRelationService.java @@ -22,6 +22,15 @@ public interface IGridRelationService { */ void save(String gridId, List relationIdArray); + /** + * 保存关联关系 + * + * @param token + * @param gridId + * @param relationIdArray + */ + void save(String token, String gridId, List relationIdArray); + /** * 删除网格关联 * diff --git a/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridRelationServiceImpl.java b/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridRelationServiceImpl.java index 09402e9e..9fb1cb26 100644 --- a/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridRelationServiceImpl.java +++ b/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridRelationServiceImpl.java @@ -7,6 +7,7 @@ import ink.wgink.interfaces.map.IGridRelationSaveAfterHandler; import ink.wgink.module.map.dao.grid.IGridRelationDao; import ink.wgink.module.map.pojo.dtos.grid.GridRelationDTO; import ink.wgink.module.map.service.grid.IGridRelationService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -31,12 +32,21 @@ public class GridRelationServiceImpl extends DefaultBaseService implements IGrid @Override public void save(String gridId, List relationIdArray) { + save(null, gridId, relationIdArray); + } + + @Override + public void save(String token, String gridId, List relationIdArray) { if (relationIdArray == null || relationIdArray.isEmpty()) { return; } Map params = getHashMap(4); params.put("gridId", gridId); - setSaveInfo(params); + if (StringUtils.isBlank(token)) { + setSaveInfo(params); + } else { + setAppSaveInfo(token, params); + } for (String relationId : relationIdArray) { params.put("relationId", relationId); gridRelationDao.save(params); diff --git a/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridUserServiceImpl.java b/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridUserServiceImpl.java index e36a5eb6..44afdc18 100644 --- a/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridUserServiceImpl.java +++ b/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridUserServiceImpl.java @@ -42,7 +42,7 @@ public class GridUserServiceImpl extends DefaultBaseService implements IGridUser if (gridRelationDTO != null) { throw new SearchException("已经添加网格"); } - gridRelationService.save(gridId, Arrays.asList(userId)); + gridRelationService.save(token, gridId, Arrays.asList(userId)); } @Override diff --git a/module-map/src/main/resources/mybatis/mapper/grid/grid-mapper.xml b/module-map/src/main/resources/mybatis/mapper/grid/grid-mapper.xml index 25950f2a..bf41e1d0 100644 --- a/module-map/src/main/resources/mybatis/mapper/grid/grid-mapper.xml +++ b/module-map/src/main/resources/mybatis/mapper/grid/grid-mapper.xml @@ -285,7 +285,7 @@ FROM map_grid_relation st1 WHERE - relation_id = #{relationId} + relation_id = #{excludeRelationId} )