Merge branch 'feature/v1.0.0.0/lyt/fixbug' of http://192.168.4.240:3000/LINK/LINK-SERVER into release/V1.0.0/test

.gitignore

@@ -32,3 +32,6 @@ build/
 ### VS Code ###
 .vscode/
 /config/application.yml
+/log/*.log
+log
+log/

src/main/java/com/lqkj/link/module/base/service/BaseService.java

@@ -45,8 +45,9 @@ public class BaseService {
     public MessageBean<String> uploadModelCompress(MultipartFile file, String path) {
         String fileName = file.getOriginalFilename();
         String suffix = fileName == null ? "" : fileName.substring(fileName.lastIndexOf(".") + 1);
-        if (!suffix.equals("zip"))
+        if (!suffix.equals("zip") || !suffix.equals("rar")) {
             return MessageBean.error("上传文件类型必须是zip、rar格式的模型文件");
+        }
         String newFileName = UUID.randomUUID() + "." + suffix;
         String filePath = "./upload/" + path;
         FileUtils.saveFile(file, filePath, newFileName);

src/main/java/com/lqkj/link/module/jwt/controller/JwtController.java

@@ -59,6 +59,9 @@ public class JwtController {
         if (userInfo == null) {
             return MessageBean.error("账号不存在！");
         }
+        if (!userInfo.getHasManage()){
+            return MessageBean.error("账号无权限，请联系管理员！");
+        }
         if (userDetailService.isLocked(userInfo.getUserCode())) {//账号是否被冻结
             return MessageBean.error("账号已被冻结,请稍后重试！");
         }

src/main/java/com/lqkj/link/module/zone/repository/ZoneInfoRepository.java

@@ -124,7 +124,7 @@ public interface ZoneInfoRepository extends JpaRepository<ZoneInfo, Integer> {
                      @Param("userCode") String userCode);
 
     @Query(nativeQuery = true,
-        value = "select auth_status != 1 from zone_info where zone_id = :zoneId"
+        value = "select auth_status = 1 or auth_status = 2 from zone_info where zone_id = :zoneId"
     )
     Boolean canBeDeleteWithAuthStatus(@Param("zoneId") Integer zoneId);
 

src/main/java/com/lqkj/link/module/zone/service/ZoneInfoService.java

@@ -274,10 +274,13 @@ public class ZoneInfoService {
     }
 
     public String deleteWork(Integer zoneId, String userCode) {
+        if(!zoneInfoRepository.existsById(zoneId)){
+            return "该作品不存在！";
+        }
         if (!zoneInfoRepository.isAuthor(zoneId, userCode)) {
             return "您不是该作品的作者!";
         }
-        if (!zoneInfoRepository.canBeDeleteWithAuthStatus(zoneId)) {
+        if (zoneInfoRepository.canBeDeleteWithAuthStatus(zoneId)) {
             return "不能删除正在审核或已发布的作品！";
         }
         zoneInfoRepository.deleteById(zoneId);