迁移数据库-debug

src/main/java/com/cmeeting/ad/service/impl/DetailsServiceImpl.java

 package com.cmeeting.ad.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.cmeeting.ad.entity.RobotSecurityUser;
 import com.cmeeting.ad.entity.SysUserSync;
 import com.cmeeting.ad.service.CustomUserDetailsService;
@@ -31,7 +32,7 @@ public class DetailsServiceImpl implements CustomUserDetailsService {
     public UserDetails loadUser(String uid, String tenantId, String role) {
         RobotSecurityUser user = new RobotSecurityUser();
         user.setUserType(UserTypeConstant.SYNC);
-        SysUserSync one = sysUserSyncService.getById(uid);
+        SysUserSync one = sysUserSyncService.getOne(new LambdaQueryWrapper<SysUserSync>().eq(SysUserSync::getUserId, uid));
         user.setId(one.getUserId());
         user.setUserId(Long.valueOf(one.getUserId()));
         user.setUsername(one.getName());

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

@@ -282,7 +282,7 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
         if (count > 0) {
             throw new RobotBaseException("添加失败。当前纪要模板名称已存在。");
         }
-
+        MeetingRecordTemplate template = baseMapper.selectOne(new LambdaQueryWrapper<MeetingRecordTemplate>().eq(MeetingRecordTemplate::getId, recordTemplateVo.getReferTemplateId()));
         Date now = new Date();
         MeetingRecordTemplate recordTemplate = new MeetingRecordTemplate();
         recordTemplate.setName(recordTemplateVo.getName());
@@ -291,7 +291,7 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
         recordTemplate.setTypeDetail(recordTemplateVo.getTypeDetail());
         recordTemplate.setPrompt(recordTemplateVo.getPrompt());
         recordTemplate.setReferTemplateId(recordTemplateVo.getReferTemplateId());
-        recordTemplate.setTemplate(defaultTemplatePath);
+        recordTemplate.setTemplate(template.getTemplate());
         if (MeetingTypeConstant.TYPE_SYSTEM.equals(role) && !RecordTemplateConstant.COMMON_MEET_TYPE.equals(meetType.getId())) {
             // 超管在系统通用会议类型下创建模板
             recordTemplate.setEnable(true);

src/main/resources/mapper/primary/SysUserSyncMapper.xml

@@ -41,7 +41,7 @@
     <select id="findName" resultType="com.cmeeting.dto.PermissionCheckedDTO$User">
         select distinct t1.user_id as id,t1.name,t2.name as deptName
         from sys_user_sync t1
-        left join sys_user_sync_category t2 on t1.dept_id = t2.dept_id and t1.tenant_id = t2.tenant_id
+        left join sys_user_sync_category t2 on t1.dept_id = t2.dept_id
         <where>
             <if test="categoryId != null and categoryId != ''">
                 and t1.dept_id = #{categoryId}
@@ -65,7 +65,7 @@
     <select id="findInUserIdsOrShareCateIds" resultType="com.cmeeting.dto.PermissionCheckedDTO$User">
         select distinct t1.user_id as id,t1.name,t2.name as deptName
         from sys_user_sync t1
-        left join sys_user_sync_category t2 on t1.dept_id = t2.dept_id and t1.tenant_id = t2.tenant_id
+        left join sys_user_sync_category t2 on t1.dept_id = t2.dept_id
         <where>
             (
             t1.user_id in
@@ -87,7 +87,7 @@
     <select id="findByParam" resultType="com.cmeeting.dto.PermissionCheckedDTO$User">
         select distinct t1.user_id as id,t1.name,t2.name as deptName
         from sys_user_sync t1
-        left join sys_user_sync_category t2 on t1.dept_id = t2.dept_id and t1.tenant_id = t2.tenant_id
+        left join sys_user_sync_category t2 on t1.dept_id = t2.dept_id
         <where>
         <if test="categoryId != null and categoryId!=''">
             and t1.dept_id = #{categoryId}