BUG修复

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicSchoolServiceImpl.java

@@ -8,6 +8,7 @@ import com.qmth.teachcloud.common.entity.BasicSchool;
 import com.qmth.teachcloud.common.enums.UploadFileEnum;
 import com.qmth.teachcloud.common.mapper.BasicSchoolMapper;
 import com.qmth.teachcloud.common.service.BasicSchoolService;
+import com.qmth.teachcloud.common.service.CommonCacheService;
 import com.qmth.teachcloud.common.util.Base64Util;
 import com.qmth.teachcloud.common.util.FileStoreUtil;
 import org.apache.commons.codec.digest.DigestUtils;
@@ -41,6 +42,9 @@ public class BasicSchoolServiceImpl extends ServiceImpl<BasicSchoolMapper, Basic
     @Resource
     FileStoreUtil fileStoreUtil;
 
+    @Resource
+    CommonCacheService commonCacheService;
+
     @Override
     public List<SchoolDto> listSchool() {
         return this.baseMapper.listSchool();
@@ -73,13 +77,15 @@ public class BasicSchoolServiceImpl extends ServiceImpl<BasicSchoolMapper, Basic
                     basicSchool.setLogo(toBase64);
                 } else {
                     fileStoreUtil.ossUpload(dirName, fileTemp, jpgFileMd5, UploadFileEnum.FILE.getFssType());
-                    basicSchool.setLogo(dirName);
+                    basicSchool.setLogo(fileStoreUtil.getPrivateUrl(dirName, UploadFileEnum.FILE.getFssType()));
                 }
             } catch (Exception e) {
                 log.error(SystemConstant.LOG_ERROR, e);
             } finally {
                 if (Objects.nonNull(fileTemp)) {
                     fileTemp.delete();
+                    commonCacheService.removeSchoolCache(basicSchool.getCode());
+                    commonCacheService.removeSchoolCache(basicSchool.getId());
                 }
             }
         }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysUserServiceImpl.java

@@ -1197,14 +1197,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         for (String cell : arr) {
             QueryWrapper<SysRole> sysRoleQueryWrapper = new QueryWrapper<>();
             sysRoleQueryWrapper.lambda().eq(SysRole::getEnable, true)
-                    .eq(SysRole::getName, cell);
-            if (Objects.isNull(RoleTypeEnum.convertDescToEnum(cell))) {
+                    .eq(SysRole::getName, cell.trim());
+            if (Objects.isNull(RoleTypeEnum.convertDescToEnum(cell.trim()))) {
                 // 自定义角色带学校id查
                 sysRoleQueryWrapper.lambda().eq(SysRole::getSchoolId, schoolId);
             }
             SysRole sysRole = sysRoleService.getOne(sysRoleQueryWrapper);
             if (Objects.isNull(sysRole)) {
-                throw ExceptionResultEnum.ERROR.exception("系统中不存在excel导入的角色【" + cell + "】");
+                throw ExceptionResultEnum.ERROR.exception("系统中不存在excel导入的角色【" + cell.trim() + "】");
             }
             roleIdList.add(sysRole.getId());
         }