提交 17588e65 作者: 洪东保

debug

父级 b07807a1
......@@ -31,7 +31,7 @@ public class RobotSecurityUser implements UserDetails {
*/
private Integer userType;
private String id;
private String userId;
private Long userId;
private String username;
@JsonIgnore
private String password;
......
......@@ -77,8 +77,8 @@ public class MeetTypeServiceImpl extends ServiceImpl<MeetTypeMapper, MeetType>
meetType.setContent(meetingTypeVo.getContent());
meetType.setCreateTime(now);
meetType.setUpdateTime(now);
meetType.setCreateUser(loginUser.getUserId());
meetType.setUpdateUser(loginUser.getUserId());
meetType.setCreateUser(String.format("%08d", loginUser.getUserId()));
meetType.setUpdateUser(String.format("%08d", loginUser.getUserId()));
meetType.setCreateUserName(loginUser.getUsername());
meetType.setUpdateUserName(loginUser.getUsername());
if (meetTypeMapper.insert(meetType) != 0) {
......@@ -111,7 +111,7 @@ public class MeetTypeServiceImpl extends ServiceImpl<MeetTypeMapper, MeetType>
meetType.setRelId(meetingTypeVo.getRelId());
meetType.setContent(meetingTypeVo.getContent());
meetType.setUpdateTime(now);
meetType.setUpdateUser(loginUser.getUserId());
meetType.setUpdateUser(String.format("%08d", loginUser.getUserId()));
meetType.setUpdateUserName(loginUser.getUsername());
if (meetTypeMapper.updateById(meetType) != 0) {
modulePermissionService.remove(new LambdaQueryWrapper<ModulePermission>()
......@@ -178,7 +178,7 @@ public class MeetTypeServiceImpl extends ServiceImpl<MeetTypeMapper, MeetType>
public List<MeetTypeDto> getSystemMeetTypeList() {
RobotSecurityUser loginUser = SecurityUtil.getUser();
// 查询系统通用会议类型
List<MeetTypeDto> meetTypeDtoList = meetTypeMapper.selectSystemMeetTypeList(loginUser.getUserId());
List<MeetTypeDto> meetTypeDtoList = meetTypeMapper.selectSystemMeetTypeList(String.format("%08d", loginUser.getUserId()));
meetTypeDtoList.stream().forEach(meetTypeDto -> meetTypeDto.setType(MeetingTypeConstant.TYPE_SYSTEM));
return meetTypeDtoList;
......@@ -193,7 +193,7 @@ public class MeetTypeServiceImpl extends ServiceImpl<MeetTypeMapper, MeetType>
public List<MeetTypeDto> getCustomMeetTypeList() {
RobotSecurityUser loginUser = SecurityUtil.getUser();
String userId = loginUser.getUserId();
String userId = String.format("%08d", loginUser.getUserId());
List<MeetTypeDto> meetTypeDtoList = meetTypeMapper.selectCustomMeetTypeList(userId);
meetTypeDtoList.stream().forEach(meetTypeDto -> meetTypeDto.setType(MeetingTypeConstant.TYPE_CUSTOM));
......
......@@ -283,8 +283,8 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
recordTemplate.setReferTemplateId(recordTemplateVo.getReferTemplateId());
recordTemplate.setCreateTime(now);
recordTemplate.setUpdateTime(now);
recordTemplate.setCreateUser(loginUser.getUserId());
recordTemplate.setUpdateUser(loginUser.getUserId());
recordTemplate.setCreateUser(String.format("%08d", loginUser.getUserId()));
recordTemplate.setUpdateUser(String.format("%08d", loginUser.getUserId()));
recordTemplate.setCreateUserName(loginUser.getUsername());
recordTemplate.setUpdateUserName(loginUser.getUsername());
baseMapper.insert(recordTemplate);
......@@ -324,7 +324,7 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
@Override
public void enable(Long id) {
RobotSecurityUser loginUser = SecurityUtil.getUser();
String userId = loginUser.getUserId();
String userId = String.format("%08d", loginUser.getUserId());
MeetingRecordTemplate recordTemplate = baseMapper.selectOne(new QueryWrapper<MeetingRecordTemplate>().select("meeting_type")
.eq("rel_id", id));
......@@ -365,21 +365,21 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
public List<RecordTemplateDto> getTemplateSelect() {
// 获取当前用户向上的的部门集合
RobotSecurityUser loginUser = SecurityUtil.getUser();
List<SysUserSyncCategory> categoryList = sysUserSyncService.getCategoryListByUserId(loginUser.getUserId());
List<SysUserSyncCategory> categoryList = sysUserSyncService.getCategoryListByUserId(String.format("%08d", loginUser.getUserId()));
List<String> parentDeptIdList = categoryList.stream().map(SysUserSyncCategory::getDeptId).collect(Collectors.toList());
List<RecordTemplateDto> resultList = new ArrayList<>();
// 查询指定授权的模板 - 从会议类型维度查询
List<RecordTemplateDto> permissionTmplInMeetTypeDtoList = baseMapper.selectPermissionTmplInMeetType(loginUser.getUserId(), parentDeptIdList);
List<RecordTemplateDto> permissionTmplInMeetTypeDtoList = baseMapper.selectPermissionTmplInMeetType(String.format("%08d", loginUser.getUserId()), parentDeptIdList);
resultList.addAll(permissionTmplInMeetTypeDtoList);
// 查询指定授权的模板 - 从纪要模板维度查询
List<RecordTemplateDto> permissionDeptTmplDtoList = baseMapper.selectPermissionTmpl(loginUser.getUserId(), parentDeptIdList);
List<RecordTemplateDto> permissionDeptTmplDtoList = baseMapper.selectPermissionTmpl(String.format("%08d", loginUser.getUserId()), parentDeptIdList);
resultList.addAll(permissionDeptTmplDtoList);
// 获取非授权的模板,包括系统通用的和自己创建的
List<RecordTemplateDto> recordTemplateDtoList = baseMapper.selectAllTmplWithoutPermission(loginUser.getUserId());
List<RecordTemplateDto> recordTemplateDtoList = baseMapper.selectAllTmplWithoutPermission(String.format("%08d", loginUser.getUserId()));
resultList.addAll(recordTemplateDtoList);
return resultList;
......
......@@ -2,10 +2,10 @@ server:
port: 8105
############################################################## minio
MINIO_ADDRESS: http://192.168.10.50:9001
MINIO_ADDRESS: http://192.168.10.153:9000
MINIO_BUCKET: zhongji
MINIO_USERNAME: aigc
MINIO_PASSWORD: aigc1qaz2wsx
MINIO_USERNAME: qizhi
MINIO_PASSWORD: qizhi123
############################################################## redis
REDIS_ADDRESS: 192.168.10.157
REDIS_PORT: 6379
......@@ -35,7 +35,7 @@ EMAIL_SMTP_HOST: smtp.office365.com
############################################################## permission
PERMISSION_APPLiCATION_ID: 1945681039926104064
PERMISSION_TENANT_ID: 1945678078692954112
PERMISSION_ADMIN_WHITE_USERS: 00001,1945678083671592960
PERMISSION_ADMIN_WHITE_USERS: 00015545,1945678083671592960
spring:
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论