suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

Browse Source
This commit is contained in:
苏竹红
2023-06-30 18:56:48 +08:00
parent 4c63d12c47 5db5891e40
commit c3da864e89
6 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml
View File

@@ -126,7 +126,7 @@
from from
sys_role r inner join enterprise_user_role e on r.role_id = e.role_id sys_role r inner join enterprise_user_role e on r.role_id = e.role_id
where where
e.user_id = #{userId} and r.deleted = 0 e.user_id = #{userId} and r.deleted = 0 and e.deleted = 0
limit 1 limit 1
</select> </select>

2
coolstore-partner-service/src/main/java/com/cool/store/service/ContentService.java
View File

@@ -28,7 +28,7 @@ public interface ContentService {
* 更新动态信息 * 更新动态信息
* @param dto * @param dto
*/ */
void updateContent(ContentUpdateDto dto); void updateContent(ContentUpdateDto dto) throws ApiException;
/** /**
* 查询动态列表 * 查询动态列表

7
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java
View File

@@ -63,7 +63,12 @@ public class ContentServiceImpl implements ContentService {
* @param dto * @param dto
*/ */
@Override @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(); HyContentInfoDO hyContentInfoDO = new HyContentInfoDO();
BeanUtil.copyProperties(dto, hyContentInfoDO); BeanUtil.copyProperties(dto, hyContentInfoDO);
hyContentInfoDO.setId(Long.parseLong(dto.getContentId())); hyContentInfoDO.setId(Long.parseLong(dto.getContentId()));

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseSyncServiceImpl.java
View File

@@ -199,6 +199,8 @@ public class EnterpriseSyncServiceImpl implements EnterpriseSyncService {
List<EnterpriseUserRoleDO> enterpriseUserRole = EnterpriseUserRoleDO.convertSyncDO(role.getRoleId(), new ArrayList<>(Arrays.asList(userDetail.getUserId()))); List<EnterpriseUserRoleDO> enterpriseUserRole = EnterpriseUserRoleDO.convertSyncDO(role.getRoleId(), new ArrayList<>(Arrays.asList(userDetail.getUserId())));
enterpriseUserRoleDAO.batchInsertOrUpdate(enterpriseUserRole); enterpriseUserRoleDAO.batchInsertOrUpdate(enterpriseUserRole);
enterpriseUserRoleDAO.deleteUserInRole(userDetail.getUserId(), DataSourceEnum.SYNC, role.getRoleId()); enterpriseUserRoleDAO.deleteUserInRole(userDetail.getUserId(), DataSourceEnum.SYNC, role.getRoleId());
}else{
enterpriseUserRoleDAO.deleteUserRole(userDetail.getUserId());
} }
EnterpriseUserDO enterpriseUser = EnterpriseUserDTO.transUserDtoToDo(userDetail, regionPathMap, leaderDeptMap); EnterpriseUserDO enterpriseUser = EnterpriseUserDTO.transUserDtoToDo(userDetail, regionPathMap, leaderDeptMap);
enterpriseUserDAO.batchInsertOrUpdate(new ArrayList<>(Arrays.asList(enterpriseUser))); enterpriseUserDAO.batchInsertOrUpdate(new ArrayList<>(Arrays.asList(enterpriseUser)));

6
coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java
View File

@@ -295,7 +295,7 @@ public class FlowServiceImpl implements FlowService {
SkrRelshipProve skrRelshipProve= BeanUtil.fillBeanWithMap(data, new SkrRelshipProve(), false); SkrRelshipProve skrRelshipProve= BeanUtil.fillBeanWithMap(data, new SkrRelshipProve(), false);
relshipProves.add(skrRelshipProve); relshipProves.add(skrRelshipProve);
} catch (Exception e) { } catch (Exception e) {
log.info("调用MDM接口出错{}", e.getMessage()); log.info("调用MDM接口出错 url{}, fileUrl{}, e{}", url, fileUrl, e);
throw new ApiException(e.getMessage()); throw new ApiException(e.getMessage());
} finally { } finally {
outputStream.close(); outputStream.close();
@@ -319,7 +319,7 @@ public class FlowServiceImpl implements FlowService {
return JSONObject.toJSONString(responseEntity.getBody().getData()); return JSONObject.toJSONString(responseEntity.getBody().getData());
} }
} catch (Exception e) { } catch (Exception e) {
log.info("调用MDM接口出错{}", e); log.info("调用MDM接口出错 url{}, e{}", url, e);
throw new ApiException(e.getMessage()); throw new ApiException(e.getMessage());
} }
return null; return null;
@@ -340,7 +340,7 @@ public class FlowServiceImpl implements FlowService {
return accessTokenDTO.getAccessToken(); return accessTokenDTO.getAccessToken();
} }
} catch (Exception e) { } catch (Exception e) {
log.info("调用MDM接口出错{}", e); log.info("获取MDM Token 出错 url:\t{}, e:\t{}", url, e);
throw new ApiException(e.getMessage()); throw new ApiException(e.getMessage());
} }
return null; return null;

2
coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java
View File

@@ -48,7 +48,7 @@ public class ContentController {
@PostMapping("/modify") @PostMapping("/modify")
@ApiOperation("修改动态") @ApiOperation("修改动态")
public ResponseResult updateContent(@RequestBody ContentUpdateDto dto) { public ResponseResult updateContent(@RequestBody ContentUpdateDto dto) throws ApiException {
contentService.updateContent(dto); contentService.updateContent(dto);
return ResponseResult.success(); return ResponseResult.success();
} }