1.0.5 update

paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/BasicFileTypeServiceImpl.java

@@ -75,7 +75,7 @@ public class BasicFileTypeServiceImpl extends ServiceImpl<BasicFileTypeMapper, B
             fileType.setId(id);
             fileType.setName(name);
             fileType.setSchoolId(schoolId);
-            fileType.setType(FileTypeEnum.CUSTOMER);
+            fileType.setType(FileTypeEnum.CUSTOMER.name());
             this.save(fileType);
         }
         return id;
@@ -87,7 +87,7 @@ public class BasicFileTypeServiceImpl extends ServiceImpl<BasicFileTypeMapper, B
         if (Objects.isNull(fileType)) {
             throw ExceptionResultEnum.ERROR.exception("文件类型不存在");
         }
-        if (fileType.getType().equals(FileTypeEnum.SYSTEM)) {
+        if (!fileType.getType().equals(FileTypeEnum.CUSTOMER.name())) {
             throw ExceptionResultEnum.ERROR.exception("只能删除自定义的文件类型");
         }
         //存在扫描文件,不能删除

paper-library-common/src/main/java/com/qmth/paper/library/common/entity/BasicFileType.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.paper.library.common.base.BaseEntity;
-import com.qmth.paper.library.common.enums.FileTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
@@ -31,7 +30,7 @@ public class BasicFileType extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "文件类型类别")
     @TableField("type")
-    private FileTypeEnum type;
+    private String type;
 
     public Long getSchoolId() {
         return schoolId;
@@ -49,11 +48,11 @@ public class BasicFileType extends BaseEntity implements Serializable {
         this.name = name;
     }
 
-    public FileTypeEnum getType() {
+    public String getType() {
         return type;
     }
 
-    public void setType(FileTypeEnum type) {
+    public void setType(String type) {
         this.type = type;
     }
 }

paper-library-common/src/main/java/com/qmth/paper/library/common/service/impl/SystemFileTypeServiceImpl.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.entity.BasicFileType;
-import com.qmth.paper.library.common.enums.FileTypeEnum;
 import com.qmth.paper.library.common.enums.SystemFileTypeEnum;
 import com.qmth.paper.library.common.mapper.BasicFileTypeMapper;
 import com.qmth.paper.library.common.service.SystemFileTypeService;
@@ -30,7 +29,7 @@ public class SystemFileTypeServiceImpl extends ServiceImpl<BasicFileTypeMapper,
                 fileType.setId(SystemConstant.getDbUuid());
                 fileType.setName(name);
                 fileType.setSchoolId(schoolId);
-                fileType.setType(FileTypeEnum.SYSTEM);
+                fileType.setType(systemFileType.name());
                 this.save(fileType);
             }
         }