提交 6bec2b7a 作者: 洪东保

debug

父级 ad167220
...@@ -38,6 +38,7 @@ public class DetailsServiceImpl implements CustomUserDetailsService { ...@@ -38,6 +38,7 @@ public class DetailsServiceImpl implements CustomUserDetailsService {
JSONObject jsonObject = HttpClientUtils.httpGet(url, UserAdminTokenUtil.getUserAdminToken()); JSONObject jsonObject = HttpClientUtils.httpGet(url, UserAdminTokenUtil.getUserAdminToken());
JSONObject data = jsonObject.getJSONObject("data"); JSONObject data = jsonObject.getJSONObject("data");
user.setId(data.getString("userId")); user.setId(data.getString("userId"));
user.setUserId(Long.valueOf(data.getString("userId")));
user.setUsername(data.getString("name")); user.setUsername(data.getString("name"));
user.setNick(data.getString("nickName")); user.setNick(data.getString("nickName"));
user.setTenantId(data.getString("tenantId")); user.setTenantId(data.getString("tenantId"));
......
...@@ -391,15 +391,15 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT ...@@ -391,15 +391,15 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
List<MeetTypeDto> resultList = new ArrayList<>(); List<MeetTypeDto> resultList = new ArrayList<>();
// 查询指定授权的模板 - 从会议类型维度查询 // 查询指定授权的模板 - 从会议类型维度查询
List<RecordTemplateDto> permissionTmplInMeetTypeDtoList = baseMapper.selectPermissionTmplInMeetType(String.format("%08d", loginUser.getUserId()), parentDeptIdList); List<MeetTypeDto> permissionTmplInMeetTypeDtoList = baseMapper.selectPermissionTmplInMeetType(userId, parentDeptIdList);
resultList.addAll(permissionTmplInMeetTypeDtoList); resultList.addAll(permissionTmplInMeetTypeDtoList);
// 查询指定授权的模板 - 从纪要模板维度查询 // 查询指定授权的模板 - 从纪要模板维度查询
List<RecordTemplateDto> permissionDeptTmplDtoList = baseMapper.selectPermissionTmpl(String.format("%08d", loginUser.getUserId()), parentDeptIdList); List<MeetTypeDto> permissionDeptTmplDtoList = baseMapper.selectPermissionTmpl(userId, parentDeptIdList);
resultList.addAll(permissionDeptTmplDtoList); resultList.addAll(permissionDeptTmplDtoList);
// 获取非授权的模板,包括系统通用的和自己创建的 // 获取非授权的模板,包括系统通用的和自己创建的
List<RecordTemplateDto> recordTemplateDtoList = baseMapper.selectAllTmplWithoutPermission(String.format("%08d", loginUser.getUserId())); List<MeetTypeDto> recordTemplateDtoList = baseMapper.selectAllTmplWithoutPermission(userId);
resultList.addAll(recordTemplateDtoList); resultList.addAll(recordTemplateDtoList);
return resultList; return resultList;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论