Merge branch 'hongdongbao'

# Conflicts:
#	src/main/java/com/cmeeting/service/impl/MeetTypeServiceImpl.java
#	src/main/java/com/cmeeting/service/impl/MeetingRecordTemplateServiceImpl.java

src/main/java/com/cmeeting/ad/entity/RobotSecurityUser.java

@@ -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;

src/main/java/com/cmeeting/service/impl/MeetTypeServiceImpl.java

@@ -81,8 +81,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) {
@@ -115,7 +115,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>()
@@ -162,7 +162,7 @@ public class MeetTypeServiceImpl extends ServiceImpl<MeetTypeMapper, MeetType>
     public List<MeetTypeDto> getMeetTypeList() {
         // 获取当前用户向上的的部门集合
         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());
 
         return meetingRecordTemplateService.getMeetTypeList(loginUser.getUserId(), parentDeptIdList);

src/main/java/com/cmeeting/service/impl/MeetingRecordTemplateServiceImpl.java

@@ -285,8 +285,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);
@@ -326,7 +326,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));
@@ -367,7 +367,7 @@ 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<MeetTypeDto> meetTypeList = getMeetTypeList(loginUser.getUserId(), parentDeptIdList);
@@ -391,15 +391,15 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
         List<MeetTypeDto> resultList = new ArrayList<>();
 
         // 查询指定授权的模板 - 从会议类型维度查询
-        List<MeetTypeDto> permissionTmplInMeetTypeDtoList = baseMapper.selectPermissionTmplInMeetType(userId, parentDeptIdList);
+        List<RecordTemplateDto> permissionTmplInMeetTypeDtoList = baseMapper.selectPermissionTmplInMeetType(String.format("%08d", loginUser.getUserId()), parentDeptIdList);
         resultList.addAll(permissionTmplInMeetTypeDtoList);
 
         // 查询指定授权的模板 - 从纪要模板维度查询
-        List<MeetTypeDto> permissionDeptTmplDtoList = baseMapper.selectPermissionTmpl(userId, parentDeptIdList);
+        List<RecordTemplateDto> permissionDeptTmplDtoList = baseMapper.selectPermissionTmpl(String.format("%08d", loginUser.getUserId()), parentDeptIdList);
         resultList.addAll(permissionDeptTmplDtoList);
 
         // 获取非授权的模板，包括系统通用的和自己创建的
-        List<MeetTypeDto> recordTemplateDtoList = baseMapper.selectAllTmplWithoutPermission(userId);
+        List<RecordTemplateDto> recordTemplateDtoList = baseMapper.selectAllTmplWithoutPermission(String.format("%08d", loginUser.getUserId()));
         resultList.addAll(recordTemplateDtoList);
 
         return resultList;

src/main/resources/application.yml

@@ -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: