1

src/main/java/com/fdkankan/manage/entity/CommonUpload.java

@@ -65,6 +65,6 @@ public class CommonUpload implements Serializable {
     @TableField("unzip_path")
     private String unzipPath;
 
-    @TableField("is_system")
-    private Integer isSystem;
+    @TableField("use_type")
+    private String useType;
 }

src/main/java/com/fdkankan/manage/entity/Dict.java

@@ -50,6 +50,6 @@ public class Dict implements Serializable {
     @TableField("sys_user_id")
     private Long sysUserId;
 
-    @TableField("is_system")
-    private Integer isSystem;
+    @TableField("use_type")
+    private String useType;
 }

src/main/java/com/fdkankan/manage/entity/DictFile.java

@@ -53,6 +53,6 @@ public class DictFile implements Serializable {
     @TableField("sys_user_id")
     private Long sysUserId;
 
-    @TableField("is_system")
-    private Integer isSystem;
+    @TableField("use_type")
+    private String useType;
 }

src/main/java/com/fdkankan/manage/service/impl/DictFileServiceImpl.java

@@ -70,7 +70,7 @@ public class DictFileServiceImpl extends ServiceImpl<IDictFileMapper, DictFile>
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
         DictFile byId = this.getById(dictFile.getId());
-        if(byId != null && byId.getIsSystem() == 1){
+        if(byId != null && StringUtils.isNotBlank(byId.getUseType()) && "animation".equals(byId.getUseType())){
             throw new BusinessException(ResultCode.DEL_ERROR);
         }
 

src/main/java/com/fdkankan/manage/service/impl/DictServiceImpl.java

@@ -39,9 +39,8 @@ public class DictServiceImpl extends ServiceImpl<IDictMapper, Dict> implements I
         }
         LambdaQueryWrapper<Dict> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(Dict::getDictKey,dictKey);
-        wrapper.and(e -> e.eq(Dict::getSysUserId,StpUtil.getLoginId()).or().eq(Dict::getIsSystem,1));
+        wrapper.and(e -> e.eq(Dict::getSysUserId,StpUtil.getLoginId()).or().eq(Dict::getUseType,"animation"));
         //wrapper.eq(Dict::getSysUserId, StpUtil.getLoginId());
-        wrapper.orderByDesc(Dict::getIsSystem);
         wrapper.orderByAsc(Dict::getSort);
         wrapper.orderByDesc(Dict::getId);
         return list(wrapper);
@@ -57,10 +56,9 @@ public class DictServiceImpl extends ServiceImpl<IDictMapper, Dict> implements I
         if(StringUtils.isNotBlank(param.getDictName())){
             wrapper.like(Dict::getDictName,param.getDictName());
         }
-        wrapper.and(e -> e.eq(Dict::getSysUserId,StpUtil.getLoginId()).or().eq(Dict::getIsSystem,1));
+        wrapper.and(e -> e.eq(Dict::getSysUserId,StpUtil.getLoginId()).or().eq(Dict::getUseType,"animation"));
 
         //wrapper.eq(Dict::getSysUserId, StpUtil.getLoginId());
-        wrapper.orderByDesc(Dict::getIsSystem);
         wrapper.orderByAsc(Dict::getSort);
         wrapper.orderByDesc(Dict::getId);
         Page<Dict> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
@@ -81,7 +79,7 @@ public class DictServiceImpl extends ServiceImpl<IDictMapper, Dict> implements I
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
         Dict byId = this.getById(dict.getId());
-        if(byId != null && byId.getIsSystem() == 1){
+        if(byId != null && StringUtils.isNotBlank(byId.getUseType()) && "animation".equals(byId.getUseType())){
             throw new BusinessException(ResultCode.DEL_ERROR);
         }
         dictFileService.updateDictId(dict.getId(),null);

src/main/java/com/fdkankan/manage/vo/request/DictFileParam.java

@@ -1,5 +1,6 @@
 package com.fdkankan.manage.vo.request;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.util.List;
@@ -13,4 +14,5 @@ public class DictFileParam extends RequestBase{
     private List<String> fileFormats;
     private List<Integer> dictIds;
     private Long sysUserId;
+    private String useType;
 }

src/main/resources/mapper/manage/DictFileMapper.xml

@@ -14,7 +14,7 @@
                           LEFT JOIN t_common_upload cu on df.upload_id = cu.id
         where df.rec_status = 'A'
         <if test="param.sysUserId != null">
-            and (df.sys_user_id = #{param.sysUserId} or df.is_system = 1)
+            and df.sys_user_id = #{param.sysUserId}
         </if>
         <if test="param.name != null and param.name !=''">
             and df.name like concat('%',#{param.name}, '%')
@@ -41,7 +41,7 @@
             </foreach>
         </if>
 
-        order by df.is_system desc , df.id desc
+        order by  df.id desc
 
         </select>
 </mapper>