liaoyitao 9 mēneši atpakaļ
vecāks
revīzija
a4ac77f2bc

+ 2 - 1
src/main/java/com/lqkj/link/module/base/service/BaseService.java

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

+ 3 - 0
src/main/java/com/lqkj/link/module/jwt/controller/JwtController.java

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

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

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

+ 4 - 1
src/main/java/com/lqkj/link/module/zone/service/ZoneInfoService.java

@@ -255,10 +255,13 @@ public class ZoneInfoService {
255
     }
255
     }
256
 
256
 
257
     public String deleteWork(Integer zoneId, String userCode) {
257
     public String deleteWork(Integer zoneId, String userCode) {
258
+        if(!zoneInfoRepository.existsById(zoneId)){
259
+            return "该作品不存在!";
260
+        }
258
         if (!zoneInfoRepository.isAuthor(zoneId, userCode)) {
261
         if (!zoneInfoRepository.isAuthor(zoneId, userCode)) {
259
             return "您不是该作品的作者!";
262
             return "您不是该作品的作者!";
260
         }
263
         }
261
-        if (!zoneInfoRepository.canBeDeleteWithAuthStatus(zoneId)) {
264
+        if (zoneInfoRepository.canBeDeleteWithAuthStatus(zoneId)) {
262
             return "不能删除正在审核或已发布的作品!";
265
             return "不能删除正在审核或已发布的作品!";
263
         }
266
         }
264
         zoneInfoRepository.deleteById(zoneId);
267
         zoneInfoRepository.deleteById(zoneId);