From eabbfd7310be4ab924823ae12c0e8e231a02588f Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Fri, 30 Jun 2023 17:21:22 +0800 Subject: [PATCH 1/2] update --- .../src/main/resources/mapper/SysRoleMapper.xml | 2 +- .../com/cool/store/service/impl/EnterpriseSyncServiceImpl.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml index e0b189d5a..b09a086ce 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml @@ -126,7 +126,7 @@ from sys_role r inner join enterprise_user_role e on r.role_id = e.role_id where - e.user_id = #{userId} and r.deleted = 0 + e.user_id = #{userId} and r.deleted = 0 and e.deleted = 0 limit 1 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java index a5c7912e8..fdebd0e79 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java @@ -199,6 +199,8 @@ public class EnterpriseSyncServiceImpl implements EnterpriseSyncService { List enterpriseUserRole = EnterpriseUserRoleDO.convertSyncDO(role.getRoleId(), new ArrayList<>(Arrays.asList(userDetail.getUserId()))); enterpriseUserRoleDAO.batchInsertOrUpdate(enterpriseUserRole); enterpriseUserRoleDAO.deleteUserInRole(userDetail.getUserId(), DataSourceEnum.SYNC, role.getRoleId()); + }else{ + enterpriseUserRoleDAO.deleteUserRole(userDetail.getUserId()); } EnterpriseUserDO enterpriseUser = EnterpriseUserDTO.transUserDtoToDo(userDetail, regionPathMap, leaderDeptMap); enterpriseUserDAO.batchInsertOrUpdate(new ArrayList<>(Arrays.asList(enterpriseUser))); From d8cba61a8481dff9d07c3ca880e48cab915142a3 Mon Sep 17 00:00:00 2001 From: pserimal Date: Fri, 30 Jun 2023 17:22:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E6=A0=87=E9=A2=98=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/service/ContentService.java | 2 +- .../com/cool/store/service/impl/ContentServiceImpl.java | 7 ++++++- .../java/com/cool/store/service/impl/FlowServiceImpl.java | 6 +++--- .../java/com/cool/store/controller/ContentController.java | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ContentService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ContentService.java index 99ad039cf..487127543 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ContentService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ContentService.java @@ -28,7 +28,7 @@ public interface ContentService { * 更新动态信息 * @param dto */ - void updateContent(ContentUpdateDto dto); + void updateContent(ContentUpdateDto dto) throws ApiException; /** * 查询动态列表 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java index f6522a26f..56fbf9e2c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java @@ -63,7 +63,12 @@ public class ContentServiceImpl implements ContentService { * @param dto */ @Override - public void updateContent(ContentUpdateDto dto) { + public void updateContent(ContentUpdateDto dto) throws ApiException { + //增加不允许重复标题的逻辑 + Boolean isDuplicated = contentInfoMapper.whetherTitleDuplicated(dto.getContentTitle()); + if (isDuplicated) { + throw new ApiException(ErrorCodeEnum.CONTENT_DUPLICATED); + } HyContentInfoDO hyContentInfoDO = new HyContentInfoDO(); BeanUtil.copyProperties(dto, hyContentInfoDO); hyContentInfoDO.setId(Long.parseLong(dto.getContentId())); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java index f82422d77..55edc289d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java @@ -295,7 +295,7 @@ public class FlowServiceImpl implements FlowService { SkrRelshipProve skrRelshipProve= BeanUtil.fillBeanWithMap(data, new SkrRelshipProve(), false); relshipProves.add(skrRelshipProve); } catch (Exception e) { - log.info("调用MDM接口出错{}", e.getMessage()); + log.info("调用MDM接口出错 url{}, fileUrl{}, e{}", url, fileUrl, e); throw new ApiException(e.getMessage()); } finally { outputStream.close(); @@ -319,7 +319,7 @@ public class FlowServiceImpl implements FlowService { return JSONObject.toJSONString(responseEntity.getBody().getData()); } } catch (Exception e) { - log.info("调用MDM接口出错{}", e); + log.info("调用MDM接口出错 url{}, e{}", url, e); throw new ApiException(e.getMessage()); } return null; @@ -340,7 +340,7 @@ public class FlowServiceImpl implements FlowService { return accessTokenDTO.getAccessToken(); } } catch (Exception e) { - log.info("调用MDM接口出错{}", e); + log.info("获取MDM Token 出错 url:\t{}, e:\t{}", url, e); throw new ApiException(e.getMessage()); } return null; diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java index feaba9dcf..28d75e5cf 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java @@ -48,7 +48,7 @@ public class ContentController { @PostMapping("/modify") @ApiOperation("修改动态") - public ResponseResult updateContent(@RequestBody ContentUpdateDto dto) { + public ResponseResult updateContent(@RequestBody ContentUpdateDto dto) throws ApiException { contentService.updateContent(dto); return ResponseResult.success(); }