Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java

@@ -74,11 +74,13 @@ public class ExtRepoDataController extends JeroController<ExtRepoData, IExtRepoD
         // 文件名称模糊查询
         String fileName = req.getParameter("fileName");
         if (StringUtils.isNotBlank(fileName)) {
+            fileName = fileName.replace("%","\\%");
             queryWrapper.like(ExtRepoData::getFileName, fileName);
         }
         // 上传人模糊查询
         String createBy = req.getParameter("createBy");
         if (StringUtils.isNotBlank(createBy)) {
+            createBy = createBy.replace("%","\\%");
             queryWrapper.like(ExtRepoData::getCreateBy, createBy);
         }
         // 更新时间查询
@@ -185,7 +187,7 @@ public class ExtRepoDataController extends JeroController<ExtRepoData, IExtRepoD
         ExtRepoData erd = extRepoDataService.queryById(id);
         if (null != erd) {
             LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-            if (extRepoFolderService.isManager() || sysUser.getUsername().equals(erd.getCreateBy())) {
+            if (sysUser.getUsername().equals(erd.getCreateBy())) {
                 extRepoDataService.deleteById(id);
                 CosBootUtil.delete(erd.getFileKey());
                 if (CutEnum.CN.getValue().equals(cut)) {

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java

@@ -359,7 +359,7 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl<ExtRepoFolderMapper, E
             res = res || getStringList(erf.getAuthManageIds()).contains(sysUser.getId())
                     || getStringList(erf.getAuthViewIds()).contains(sysUser.getId());
         }
-        return false;
+        return res;
 
     }