1

src/main/java/com/fdkankan/manage/common/ResultCode.java

@@ -108,6 +108,7 @@ public enum ResultCode  {
 
     upload_file_limit(60032, "大小超限制"),
 
+    DEL_ERROR(60033, "无法删除系统默认"),
     ;
 
     private Integer code;

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

@@ -61,7 +61,10 @@ public class CommonUpload implements Serializable {
 
     @TableField("status")
     private Integer status;
+
     @TableField("unzip_path")
     private String unzipPath;
 
+    @TableField("is_system")
+    private Integer isSystem;
 }

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

@@ -49,4 +49,7 @@ public class Dict implements Serializable {
 
     @TableField("sys_user_id")
     private Long sysUserId;
+
+    @TableField("is_system")
+    private Integer isSystem;
 }

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

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

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

@@ -69,6 +69,11 @@ public class DictFileServiceImpl extends ServiceImpl<IDictFileMapper, DictFile>
         if(dictFile.getId() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
+        DictFile byId = this.getById(dictFile.getId());
+        if(byId != null && byId.getIsSystem() == 1){
+            throw new BusinessException(ResultCode.DEL_ERROR);
+        }
+
         this.removeById(dictFile.getId());
     }
 

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

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

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}
+            and (df.sys_user_id = #{param.sysUserId} or df.is_system = 1)
         </if>
         <if test="param.name != null and param.name !=''">
             and df.name like concat('%',#{param.name}, '%')