全局状态定义 修改

eco-common/common-core/src/main/java/org/eco/common/core/constant/TenantConstants.java

@@ -4,7 +4,6 @@ package org.eco.common.core.constant;
  * 租户常量信息
  *
  * @author wgk
- * @author wgk
  */
 public interface TenantConstants {
 

eco-common/common-core/src/main/java/org/eco/common/core/constant/UserConstants.java

@@ -14,52 +14,52 @@ public class UserConstants {
     /**
      * 正常状态
      */
-    public static final String NORMAL = "0";
+    public static final String NORMAL = "1";
 
     /**
      * 异常状态
      */
-    public static final String EXCEPTION = "1";
+    public static final String EXCEPTION = "2";
 
     /**
      * 用户正常状态
      */
-    public static final String USER_NORMAL = "0";
+    public static final String USER_NORMAL = "1";
 
     /**
      * 用户封禁状态
      */
-    public static final String USER_DISABLE = "1";
+    public static final String USER_DISABLE = "0";
 
     /**
      * 角色正常状态
      */
-    public static final String ROLE_NORMAL = "0";
+    public static final String ROLE_NORMAL = "1";
 
     /**
      * 角色封禁状态
      */
-    public static final String ROLE_DISABLE = "1";
+    public static final String ROLE_DISABLE = "0";
 
     /**
      * 部门正常状态
      */
-    public static final String DEPT_NORMAL = "0";
+    public static final String DEPT_NORMAL = "1";
 
     /**
      * 部门停用状态
      */
-    public static final String DEPT_DISABLE = "1";
+    public static final String DEPT_DISABLE = "0";
 
     /**
      * 岗位正常状态
      */
-    public static final String POST_NORMAL = "0";
+    public static final String POST_NORMAL = "1";
 
     /**
      * 岗位停用状态
      */
-    public static final String POST_DISABLE = "1";
+    public static final String POST_DISABLE = "0";
 
     /**
      * 是否为系统默认（是）
@@ -69,22 +69,22 @@ public class UserConstants {
     /**
      * 是否菜单外链（是）
      */
-    public static final String YES_FRAME = "0";
+    public static final String YES_FRAME = "1";
 
     /**
      * 是否菜单外链（否）
      */
-    public static final String NO_FRAME = "1";
+    public static final String NO_FRAME = "0";
 
     /**
      * 菜单正常状态
      */
-    public static final String MENU_NORMAL = "0";
+    public static final String MENU_NORMAL = "1";
 
     /**
      * 菜单停用状态
      */
-    public static final String MENU_DISABLE = "1";
+    public static final String MENU_DISABLE = "0";
 
     /**
      * 菜单类型（目录）

eco-common/common-core/src/main/java/org/eco/common/core/enums/UserStatus.java

@@ -6,7 +6,7 @@ package org.eco.common.core.enums;
  * @author wgk
  */
 public enum UserStatus {
-    OK("0", "正常"), DISABLE("1", "停用"), DELETED("2", "删除");
+    OK("1", "正常"), DISABLE("0", "停用"), DELETED("2", "删除");
 
     private final String code;
     private final String info;

eco-common/common-core/src/main/java/org/eco/common/core/utils/file/FileUploadUtils.java

@@ -66,9 +66,9 @@ public class FileUploadUtils {
      * @param baseDir 相对应用的基目录
      * @param file    上传的文件
      * @return 文件名称
-     * @throws IOException
+     * @throws IOException 异常
      */
-    public static final String upload(String baseDir, MultipartFile file) throws IOException {
+    public static String upload(String baseDir, MultipartFile file) throws IOException {
         try {
             return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
         } catch (Exception e) {

eco-common/common-excel/src/main/java/org/eco/common/excel/core/DefaultExcelResult.java

@@ -12,18 +12,17 @@ import java.util.List;
  * @author Yjoioooo
  * @author wgk
  */
+@Setter
 public class DefaultExcelResult<T> implements ExcelResult<T> {
 
     /**
      * 数据对象list
      */
-    @Setter
     private List<T> list;
 
     /**
      * 错误信息列表
      */
-    @Setter
     private List<String> errorList;
 
     public DefaultExcelResult() {

eco-common/common-log/src/main/java/org/eco/common/log/event/LogininforEvent.java

@@ -29,7 +29,7 @@ public class LogininforEvent implements Serializable {
     private String username;
 
     /**
-     * 登录状态 0成功 1失败
+     * 登录状态 1成功 0失败
      */
     private String status;
 

eco-common/common-log/src/main/java/org/eco/common/log/event/OperLogEvent.java

@@ -94,7 +94,7 @@ public class OperLogEvent implements Serializable {
     private String jsonResult;
 
     /**
-     * 操作状态（0正常 1异常）
+     * 操作状态（1正常 0异常）
      */
     private Integer status;
 

eco-common/common-oss/src/main/java/org/eco/common/oss/constant/OssConstant.java

@@ -25,7 +25,7 @@ public interface OssConstant {
     /**
      * 系统数据ids
      */
-    List<Long> SYSTEM_DATA_IDS = Arrays.asList(1L, 2L, 3L, 4L);
+    List<Long> SYSTEM_DATA_IDS = Arrays.asList(1L, 2L, 3L, 4L, 5L);
 
     /**
      * 云服务商

eco-common/common-tenant/src/main/java/org/eco/common/tenant/config/TenantConfig.java

@@ -23,7 +23,6 @@ import org.springframework.context.annotation.Primary;
  * 租户配置类
  *
  * @author wgk
- * @author wgk
  */
 @AutoConfiguration(after = {RedisConfig.class, MyBatisFlexConfig.class})
 public class TenantConfig {

eco-common/common-tenant/src/main/java/org/eco/common/tenant/handle/TenantKeyPrefixHandler.java

@@ -11,7 +11,6 @@ import lombok.extern.slf4j.Slf4j;
  * 多租户redis缓存key前缀处理
  *
  * @author wgk
- * @author wgk
  */
 @Slf4j
 public class TenantKeyPrefixHandler extends KeyPrefixHandler {

eco-common/common-tenant/src/main/java/org/eco/common/tenant/helper/TenantHelper.java

@@ -18,7 +18,6 @@ import java.util.function.Supplier;
  * 租户助手
  *
  * @author wgk
- * @author wgk
  */
 @Slf4j
 @NoArgsConstructor(access = AccessLevel.PRIVATE)

eco-modules/system/src/main/java/org/eco/system/domain/SysClient.java

@@ -64,7 +64,7 @@ public class SysClient implements Serializable {
     private Long timeout;
 
     /**
-     * 状态（0正常 1停用）
+     * 状态（1正常 0停用）
      */
     private String status;
 

eco-modules/system/src/main/java/org/eco/system/domain/SysDept.java

@@ -62,7 +62,7 @@ public class SysDept extends BaseEntity {
     private String email;
 
     /**
-     * 部门状态:0正常,1停用
+     * 部门状态:1正常,0停用
      */
     private String status;
 

eco-modules/system/src/main/java/org/eco/system/domain/SysLogininfor.java

@@ -49,7 +49,7 @@ public class SysLogininfor implements Serializable {
     private String deviceType;
 
     /**
-     * 登录状态 0成功 1失败
+     * 登录状态 1成功 0失败
      */
     private String status;
 

eco-modules/system/src/main/java/org/eco/system/domain/SysMenu.java

@@ -89,12 +89,12 @@ public class SysMenu implements Serializable {
     private String menuType;
 
     /**
-     * 显示状态（0显示 1隐藏）
+     * 显示状态（1显示 0隐藏）
      */
     private String visible;
 
     /**
-     * 菜单状态（0显示 1隐藏）
+     * 菜单状态（1显示 0隐藏）
      */
     private String status;
 

eco-modules/system/src/main/java/org/eco/system/domain/SysNotice.java

@@ -37,7 +37,7 @@ public class SysNotice extends BaseEntity {
     private String noticeContent;
 
     /**
-     * 公告状态（0正常 1关闭）
+     * 公告状态（1正常,0停用）
      */
     private String status;
 

eco-modules/system/src/main/java/org/eco/system/domain/SysOperLog.java

@@ -99,7 +99,7 @@ public class SysOperLog implements Serializable {
     private String jsonResult;
 
     /**
-     * 操作状态（0正常 1异常）
+     * 操作状态（1正常 0异常）
      */
     private Integer status;
 

eco-modules/system/src/main/java/org/eco/system/domain/SysOssConfig.java

@@ -68,7 +68,7 @@ public class SysOssConfig extends BaseEntity {
     private String region;
 
     /**
-     * 是否默认（0=是,1=否）
+     * 是否默认（1=是,0=否）
      */
     private String status;
 

eco-modules/system/src/main/java/org/eco/system/domain/SysPost.java

@@ -38,7 +38,7 @@ public class SysPost extends BaseEntity {
     private Integer postSort;
 
     /**
-     * 状态（0正常 1停用）
+     * 状态（1正常 0停用）
      */
     private String status;
 

eco-modules/system/src/main/java/org/eco/system/domain/SysRole.java

@@ -58,7 +58,7 @@ public class SysRole extends BaseEntity {
     private boolean deptCheckStrictly;
 
     /**
-     * 角色状态（0正常 1停用）
+     * 角色状态（1正常 0停用）
      */
     private String status;
 

eco-modules/system/src/main/java/org/eco/system/domain/SysTenant.java

@@ -84,7 +84,7 @@ public class SysTenant implements Serializable {
     private Long accountCount;
 
     /**
-     * 租户状态（0正常 1停用）
+     * 租户状态（1正常 0停用）
      */
     private String status;
 

eco-modules/system/src/main/java/org/eco/system/domain/SysTenantPackage.java

@@ -14,7 +14,6 @@ import java.util.Date;
  * 租户套餐对象 sys_tenant_package
  *
  * @author wgk
- * @author wgk
  */
 @Data
 @Table("sys_tenant_package")
@@ -45,7 +44,7 @@ public class SysTenantPackage implements Serializable {
      */
     private Boolean menuCheckStrictly;
     /**
-     * 状态（0正常 1停用）
+     * 状态（1正常 0停用）
      */
     private String status;
 

eco-modules/system/src/main/java/org/eco/system/domain/SysUser.java

@@ -78,7 +78,7 @@ public class SysUser extends BaseEntity {
     private String password;
 
     /**
-     * 帐号状态（0正常 1停用）
+     * 帐号状态（1正常 0停用）
      */
     private String status;
 

eco-modules/system/src/main/java/org/eco/system/domain/bo/SysClientBo.java

@@ -69,7 +69,7 @@ public class SysClientBo implements Serializable {
     private Long timeout;
 
     /**
-     * 状态（0正常 1停用）
+     * 状态（1正常 0停用）
      */
     private String status;
 

eco-modules/system/src/main/java/org/eco/system/domain/bo/SysDeptBo.java

@@ -63,7 +63,7 @@ public class SysDeptBo extends BaseEntity {
     private String email;
 
     /**
-     * 部门状态（0正常 1停用）
+     * 部门状态（1正常 0停用）
      */
     private String status;
 

eco-modules/system/src/main/java/org/eco/system/domain/bo/SysLogininforBo.java

@@ -69,7 +69,7 @@ public class SysLogininforBo implements Serializable {
     private String os;
 
     /**
-     * 登录状态（0成功 1失败）
+     * 登录状态（1成功 0失败）
      */
     private String status;
 

eco-modules/system/src/main/java/org/eco/system/domain/bo/SysMenuBo.java

@@ -83,12 +83,12 @@ public class SysMenuBo implements Serializable {
     private String menuType;
 
     /**
-     * 显示状态（0显示 1隐藏）
+     * 显示状态（1显示 0隐藏）
      */
     private String visible;
 
     /**
-     * 菜单状态（0正常 1停用）
+     * 菜单状态（1正常 0停用）
      */
     private String status;
 

eco-modules/system/src/main/java/org/eco/system/domain/bo/SysNoticeBo.java

@@ -44,7 +44,7 @@ public class SysNoticeBo extends BaseEntity {
     private String noticeContent;
 
     /**
-     * 公告状态（0正常 1关闭）
+     * 公告状态（1正常,0停用）
      */
     private String status;
 

eco-modules/system/src/main/java/org/eco/system/domain/bo/SysOperLogBo.java

@@ -100,7 +100,7 @@ public class SysOperLogBo {
     private String jsonResult;
 
     /**
-     * 操作状态（0正常 1异常）
+     * 操作状态（1正常 0异常）
      */
     private Integer status;
 

eco-modules/system/src/main/java/org/eco/system/domain/bo/SysOssConfigBo.java

@@ -80,7 +80,7 @@ public class SysOssConfigBo extends BaseEntity {
     private String isHttps;
 
     /**
-     * 是否默认（0=是,1=否）
+     * 是否默认（1=是,0=否）
      */
     private String status;
 

eco-modules/system/src/main/java/org/eco/system/domain/bo/SysPostBo.java

@@ -46,7 +46,7 @@ public class SysPostBo extends BaseEntity {
     private Integer postSort;
 
     /**
-     * 状态（0正常 1停用）
+     * 状态（1正常 0停用）
      */
     private String status;
 

eco-modules/system/src/main/java/org/eco/system/domain/bo/SysRoleBo.java

@@ -64,7 +64,7 @@ public class SysRoleBo extends BaseEntity {
     private Boolean deptCheckStrictly;
 
     /**
-     * 角色状态（0正常 1停用）
+     * 角色状态（1正常 0停用）
      */
     private String status;
 

eco-modules/system/src/main/java/org/eco/system/domain/bo/SysTenantBo.java

@@ -94,7 +94,7 @@ public class SysTenantBo implements Serializable {
     private Long accountCount;
 
     /**
-     * 租户状态（0正常 1停用）
+     * 租户状态（1正常 0停用）
      */
     private String status;
 

eco-modules/system/src/main/java/org/eco/system/domain/bo/SysTenantPackageBo.java

@@ -46,7 +46,7 @@ public class SysTenantPackageBo implements Serializable {
     private Boolean menuCheckStrictly;
 
     /**
-     * 状态（0正常 1停用）
+     * 状态（1正常 0停用）
      */
     private String status;
 

eco-modules/system/src/main/java/org/eco/system/domain/bo/SysUserBo.java

@@ -85,7 +85,7 @@ public class SysUserBo extends BaseEntity {
     private String password;
 
     /**
-     * 帐号状态（0正常 1停用）
+     * 帐号状态（1正常 0停用）
      */
     private String status;
 

eco-modules/system/src/main/java/org/eco/system/domain/vo/ImportExportImportVo.java

@@ -1,12 +1,11 @@
 package org.eco.system.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.eco.common.excel.annotation.ExcelDictFormat;
-import org.eco.common.excel.convert.ExcelDictConvert;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import java.io.Serial;
 import java.io.Serializable;
-import lombok.NoArgsConstructor;
 
 /**
  * 导入导出日志导入视图对象 sys_import_export_t
@@ -17,26 +16,33 @@ import lombok.NoArgsConstructor;
 
 @Data
 @NoArgsConstructor
-public class ImportExportImportVo implements Serializable
-{
+public class ImportExportImportVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
 
 
-     /** 唯一编码 */
+    /**
+     * 唯一编码
+     */
     @ExcelProperty(value = "唯一编码")
     private Long id;
 
-     /** 文件名称 */
+    /**
+     * 文件名称
+     */
     @ExcelProperty(value = "文件名称")
     private String name;
 
-     /** 日志信息 */
+    /**
+     * 日志信息
+     */
     @ExcelProperty(value = "日志信息")
     private String logInfo;
 
-     /** 状态 */
+    /**
+     * 状态
+     */
     @ExcelProperty(value = "状态")
     private Integer status;
 

eco-modules/system/src/main/java/org/eco/system/domain/vo/SysClientVo.java

@@ -80,7 +80,7 @@ public class SysClientVo implements Serializable {
     private Long timeout;
 
     /**
-     * 状态（0正常 1停用）
+     * 状态（1正常 0停用）
      */
     @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "0=正常,1=停用")

eco-modules/system/src/main/java/org/eco/system/domain/vo/SysDeptVo.java

@@ -78,7 +78,7 @@ public class SysDeptVo implements Serializable {
     private String email;
 
     /**
-     * 部门状态（0正常 1停用）
+     * 部门状态（1正常 0停用）
      */
     @ExcelProperty(value = "部门状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "sys_normal_disable")

eco-modules/system/src/main/java/org/eco/system/domain/vo/SysLogininforVo.java

@@ -58,7 +58,7 @@ public class SysLogininforVo implements Serializable {
     private String deviceType;
 
     /**
-     * 登录状态（0成功 1失败）
+     * 登录状态（1成功 0失败）
      */
     @ExcelProperty(value = "登录状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "sys_common_status")

eco-modules/system/src/main/java/org/eco/system/domain/vo/SysMenuVo.java

@@ -79,12 +79,12 @@ public class SysMenuVo implements Serializable {
     private String menuType;
 
     /**
-     * 显示状态（0显示 1隐藏）
+     * 显示状态（1显示 0隐藏）
      */
     private String visible;
 
     /**
-     * 菜单状态（0正常 1停用）
+     * 菜单状态（1正常 0停用）
      */
     private String status;
 

eco-modules/system/src/main/java/org/eco/system/domain/vo/SysNoticeVo.java

@@ -41,7 +41,7 @@ public class SysNoticeVo implements Serializable {
     private String noticeContent;
 
     /**
-     * 公告状态（0正常 1关闭）
+     * 公告状态（1正常,0停用）
      */
     private String status;
 

eco-modules/system/src/main/java/org/eco/system/domain/vo/SysOperLogVo.java

@@ -118,7 +118,7 @@ public class SysOperLogVo implements Serializable {
     private String jsonResult;
 
     /**
-     * 操作状态（0正常 1异常）
+     * 操作状态（1正常 0异常）
      */
     @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "sys_common_status")

eco-modules/system/src/main/java/org/eco/system/domain/vo/SysOssConfigVo.java

@@ -75,7 +75,7 @@ public class SysOssConfigVo implements Serializable {
     private String region;
 
     /**
-     * 是否默认（0=是,1=否）
+     * 是否默认（1=是,0=否）
      */
     private String status;
 

eco-modules/system/src/main/java/org/eco/system/domain/vo/SysPostVo.java

@@ -48,7 +48,7 @@ public class SysPostVo implements Serializable {
     private Integer postSort;
 
     /**
-     * 状态（0正常 1停用）
+     * 状态（1正常 0停用）
      */
     @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "sys_normal_disable")

eco-modules/system/src/main/java/org/eco/system/domain/vo/SysRoleVo.java

@@ -71,7 +71,7 @@ public class SysRoleVo implements Serializable {
     private Boolean deptCheckStrictly;
 
     /**
-     * 角色状态（0正常 1停用）
+     * 角色状态（1正常 0停用）
      */
     @ExcelProperty(value = "角色状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "sys_normal_disable")

eco-modules/system/src/main/java/org/eco/system/domain/vo/SysTenantPackageVo.java

@@ -56,7 +56,7 @@ public class SysTenantPackageVo implements Serializable {
     private Boolean menuCheckStrictly;
 
     /**
-     * 状态（0正常 1停用）
+     * 状态（1正常 0停用）
      */
     @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "0=正常,1=停用")

eco-modules/system/src/main/java/org/eco/system/domain/vo/SysTenantVo.java

@@ -99,7 +99,7 @@ public class SysTenantVo implements Serializable {
     private Long accountCount;
 
     /**
-     * 租户状态（0正常 1停用）
+     * 租户状态（1正常 0停用）
      */
     @ExcelProperty(value = "租户状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "0=正常,1=停用")

eco-modules/system/src/main/java/org/eco/system/domain/vo/SysUserExportVo.java

@@ -64,7 +64,7 @@ public class SysUserExportVo implements Serializable {
     private String gender;
 
     /**
-     * 帐号状态（0正常 1停用）
+     * 帐号状态（1正常 0停用）
      */
     @ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "sys_normal_disable")

eco-modules/system/src/main/java/org/eco/system/domain/vo/SysUserImportVo.java

@@ -70,7 +70,7 @@ public class SysUserImportVo implements Serializable {
     private String gender;
 
     /**
-     * 帐号状态（0正常 1停用）
+     * 帐号状态（1正常 0停用）
      */
     @ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "sys_normal_disable")

eco-modules/system/src/main/java/org/eco/system/domain/vo/SysUserVo.java

@@ -93,7 +93,7 @@ public class SysUserVo extends BaseEntity {
     private String password;
 
     /**
-     * 帐号状态（0正常 1停用）
+     * 帐号状态（1正常 0停用）
      */
     private String status;
 

eco-modules/system/src/main/java/org/eco/system/listener/SysUserImportListener.java

@@ -5,21 +5,21 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.crypto.digest.BCrypt;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
+import lombok.extern.slf4j.Slf4j;
 import org.eco.common.core.exception.BusinessException;
-import org.eco.system.domain.bo.SysUserBo;
-import org.eco.system.domain.vo.SysUserImportVo;
 import org.eco.common.core.utils.SpringUtils;
 import org.eco.common.core.utils.StringUtils;
 import org.eco.common.core.utils.ValidatorUtils;
 import org.eco.common.excel.core.ExcelListener;
 import org.eco.common.excel.core.ExcelResult;
 import org.eco.common.security.utils.LoginHelper;
+import org.eco.system.domain.bo.SysUserBo;
 import org.eco.system.domain.vo.SysDeptVo;
+import org.eco.system.domain.vo.SysUserImportVo;
 import org.eco.system.domain.vo.SysUserVo;
 import org.eco.system.service.ISysConfigService;
 import org.eco.system.service.ISysDeptService;
 import org.eco.system.service.ISysUserService;
-import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;
 
@@ -91,13 +91,11 @@ public class SysUserImportListener extends AnalysisEventListener<SysUserImportVo
                             failureNum++;
                             failureMsg.append("<br/>").append(failureNum).append("、账号 ").append(sysUser.getUserName()).append(" 已存在");
                         }
-
                     } else {
                         failureNum++;
                         failureMsg.append("<br/>").append(failureNum).append("、账号 ").append(sysUser.getUserName()).append(" 的部门名称 ").append(userVo.getDeptName()).append(" 在部门表中不存在，无法导入");
                     }
                 }
-
                 if (deptCount == 0) {
                     failureNum++;
                     failureMsg.append("<br/>").append(failureNum).append("、账号 ").append(userVo.getUserName()).append(" 的部门名称 ").append(userVo.getDeptName()).append(" 在部门表中不存在，无法导入");
@@ -110,7 +108,6 @@ public class SysUserImportListener extends AnalysisEventListener<SysUserImportVo
                 failureNum++;
                 failureMsg.append("<br/>").append(failureNum).append("、账号 ").append(userVo.getUserName()).append(" 的部门名称为空，无法导入");
             }
-
         } catch (Exception e) {
             failureNum++;
             String msg = "<br/>" + failureNum + "、账号 " + userVo.getUserName() + " 导入失败：";
@@ -121,13 +118,12 @@ public class SysUserImportListener extends AnalysisEventListener<SysUserImportVo
 
     @Override
     public void doAfterAllAnalysed(AnalysisContext context) {
-
+        log.info(context.toString());
     }
 
     @Override
     public ExcelResult<SysUserImportVo> getExcelResult() {
         return new ExcelResult<>() {
-
             @Override
             public String getAnalysis() {
                 if (failureNum > 0) {

eco-modules/system/src/main/java/org/eco/system/mapper/SysRoleMapper.java

@@ -24,7 +24,6 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
 
     /**
      * 根据用户ID查询其拥有的角色列表
-     *
      * 为了避免在数据权限SysDataScopeServiceImpl引用产生循环引用问题，将该方法的实现由service转到mapper中（2023.11.21）
      *
      * @param userId 用户ID
@@ -43,11 +42,9 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
             .leftJoin(SYS_USER_ROLE).as("ur").on(SYS_USER_ROLE.ROLE_ID.eq(SYS_ROLE.ROLE_ID))
             .leftJoin(SYS_USER).as("u").on(SYS_USER.USER_ID.eq(SYS_USER_ROLE.USER_ID))
             .leftJoin(SYS_DEPT).as("d").on(SYS_DEPT.DEPT_ID.eq(SYS_USER.DEPT_ID));
-        queryWrapper.where(SYS_ROLE.DEL_FLAG.eq(0))
+        queryWrapper.where(SYS_ROLE.DEL_FLAG.eq(1))
             .and(SYS_USER_ROLE.USER_ID.eq(userId));
 
-        List<SysRoleVo> userRoles = selectListByQueryAs(queryWrapper, SysRoleVo.class);
-
-        return userRoles;
+        return selectListByQueryAs(queryWrapper, SysRoleVo.class);
     }
 }

eco-modules/system/src/main/java/org/eco/system/service/impl/SysConfigServiceImpl.java

@@ -87,17 +87,16 @@ public class SysConfigServiceImpl extends BaseServiceImpl<SysConfigMapper, SysCo
     /**
      * 构造查询条件
      *
-     * @param config
+     * @param config 参数
      * @return 查询条件
      */
 
     private QueryWrapper buildQueryWrapper(SysConfigBo config) {
-        QueryWrapper queryWrapper = super.buildBaseQueryWrapper()
+        return super.buildBaseQueryWrapper()
             .and(SYS_CONFIG.CONFIG_NAME.like(config.getConfigName()))
             .and(SYS_CONFIG.CONFIG_TYPE.eq(config.getConfigType()))
             .and(SYS_CONFIG.CONFIG_KEY.like(config.getConfigKey()))
             .and(SYS_CONFIG.CREATE_TIME.between(config.getParams().get("beginTime"), config.getParams().get("endTime")));
-        return queryWrapper;
     }
 
     /**
@@ -203,9 +202,9 @@ public class SysConfigServiceImpl extends BaseServiceImpl<SysConfigMapper, SysCo
      */
     @Override
     public boolean checkConfigKeyUnique(SysConfigBo config) {
-        Long configId = StringUtils.isNull(config.getConfigId()) ? -1L : config.getConfigId();
+        long configId = StringUtils.isNull(config.getConfigId()) ? -1L : config.getConfigId();
         SysConfig info = this.getOne(query().where(SYS_CONFIG.CONFIG_KEY.eq(config.getConfigKey())));
-        if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != configId.longValue()) {
+        if (StringUtils.isNotNull(info) && info.getConfigId() != configId) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;

eco-modules/system/src/main/java/org/eco/system/service/impl/SysDeptServiceImpl.java

@@ -43,7 +43,6 @@ import static org.eco.system.domain.table.SysRoleDeptTableDef.SYS_ROLE_DEPT;
  * 部门管理 服务实现
  *
  * @author wgk
- * @author wgk
  */
 @RequiredArgsConstructor
 @Service
@@ -67,7 +66,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptMapper, SysDept>
      * @return 查询条件
      */
     private QueryWrapper buildQueryWrapper(SysDeptBo deptBo) {
-        //where(SYS_DEPT.DEL_FLAG.eq(0));//逻辑删除字段，mybatis-flex会自动添加该条件
+        //where(SYS_DEPT.DEL_FLAG.eq(1));//逻辑删除字段，mybatis-flex会自动添加该条件
         return super.buildBaseQueryWrapper()
             .and(SYS_DEPT.DEPT_ID.eq(deptBo.getDeptId()))
             .and(SYS_DEPT.PARENT_ID.eq(deptBo.getParentId()))
@@ -164,7 +163,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptMapper, SysDept>
      */
     @Override
     public long selectDeptCountByName(String deptName) {
-        QueryWrapper queryWrapper = query().where(SYS_DEPT.DEPT_NAME.eq(deptName)).and(SYS_DEPT.STATUS.eq("0"));
+        QueryWrapper queryWrapper = query().where(SYS_DEPT.DEPT_NAME.eq(deptName)).and(SYS_DEPT.STATUS.eq("1"));
         return this.count(queryWrapper);
     }
 
@@ -176,7 +175,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptMapper, SysDept>
      */
     @Override
     public SysDeptVo selectDeptByName(String deptName) {
-        QueryWrapper queryWrapper = query().where(SYS_DEPT.DEPT_NAME.eq(deptName)).and(SYS_DEPT.STATUS.eq("0"));
+        QueryWrapper queryWrapper = query().where(SYS_DEPT.DEPT_NAME.eq(deptName)).and(SYS_DEPT.STATUS.eq("1"));
         return this.getOneAs(queryWrapper, SysDeptVo.class);
     }
 
@@ -191,7 +190,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptMapper, SysDept>
         QueryWrapper queryWrapper = QueryWrapper.create()
             .select(QueryMethods.count(SYS_DEPT.DEPT_ID))
             .from(SYS_DEPT)
-            .where(SYS_DEPT.STATUS.eq("0"))
+            .where(SYS_DEPT.STATUS.eq("1"))
             .and(QueryMethods.findInSet(QueryMethods.number(deptId), SYS_DEPT.ANCESTORS).gt(0));
         return deptMapper.selectObjectByQueryAs(queryWrapper, Integer.class);
     }

eco-modules/system/src/main/java/org/eco/system/service/impl/SysDictDataServiceImpl.java

@@ -31,7 +31,6 @@ import static org.eco.system.domain.table.SysDictDataTableDef.SYS_DICT_DATA;
  * 字典 业务层处理
  *
  * @author wgk
- * @author wgk
  */
 @RequiredArgsConstructor
 @Service

eco-modules/system/src/main/java/org/eco/system/service/impl/SysDictTypeServiceImpl.java

@@ -42,7 +42,6 @@ import static org.eco.system.domain.table.SysDictTypeTableDef.SYS_DICT_TYPE;
  * 字典 业务层处理
  *
  * @author wgk
- * @author wgk
  */
 @Service
 public class SysDictTypeServiceImpl extends BaseServiceImpl<SysDictTypeMapper, SysDictType> implements ISysDictTypeService, DictService {

eco-modules/system/src/main/java/org/eco/system/service/impl/SysLogininforServiceImpl.java

@@ -42,7 +42,6 @@ import static org.eco.system.domain.table.SysLogininforTableDef.SYS_LOGININFOR;
  * 系统访问日志情况信息 服务层处理
  *
  * @author wgk
- * @author wgk
  */
 @RequiredArgsConstructor
 @Slf4j

eco-modules/system/src/main/java/org/eco/system/service/impl/SysMenuServiceImpl.java

@@ -49,7 +49,6 @@ import static org.eco.system.domain.table.SysUserTableDef.SYS_USER;
  * 菜单 业务层处理
  *
  * @author wgk
- * @author wgk
  */
 @Service
 public class SysMenuServiceImpl extends BaseServiceImpl<SysMenuMapper, SysMenu> implements ISysMenuService {
@@ -159,8 +158,8 @@ public class SysMenuServiceImpl extends BaseServiceImpl<SysMenuMapper, SysMenu>
             .leftJoin(SYS_ROLE_MENU).on(SYS_ROLE_MENU.MENU_ID.eq(SYS_MENU.MENU_ID))
             .leftJoin(SYS_USER_ROLE).on(SYS_USER_ROLE.ROLE_ID.eq(SYS_ROLE_MENU.ROLE_ID))
             .leftJoin(SYS_ROLE).on(SYS_ROLE.ROLE_ID.eq(SYS_USER_ROLE.ROLE_ID))
-            .where(SYS_MENU.STATUS.eq("0"))
-            .and(SYS_ROLE.STATUS.eq("0"))
+            .where(SYS_MENU.STATUS.eq("1"))
+            .and(SYS_ROLE.STATUS.eq("1"))
             .and(SYS_USER_ROLE.USER_ID.eq(userId));
 
         List<String> perms = this.listAs(queryWrapper, String.class);
@@ -190,7 +189,7 @@ public class SysMenuServiceImpl extends BaseServiceImpl<SysMenuMapper, SysMenu>
             .select(distinct(SYS_MENU.PERMS))
             .from(SYS_MENU)
             .leftJoin(SYS_ROLE_MENU).on(SYS_ROLE_MENU.MENU_ID.eq(SYS_MENU.MENU_ID))
-            .where(SYS_MENU.STATUS.eq("0"))
+            .where(SYS_MENU.STATUS.eq("1"))
             .and(SYS_ROLE_MENU.ROLE_ID.eq(roleId));
 
         List<String> perms = this.listAs(queryWrapper, String.class);
@@ -240,8 +239,8 @@ public class SysMenuServiceImpl extends BaseServiceImpl<SysMenuMapper, SysMenu>
                 .leftJoin(SYS_USER).on(SYS_USER.USER_ID.eq(SYS_USER_ROLE.USER_ID))
                 .where(SYS_USER.USER_ID.eq(userId))
                 .and(SYS_MENU.MENU_TYPE.in("M", "C"))
-                .and(SYS_MENU.STATUS.eq("0"))
-                .and(SYS_ROLE.STATUS.eq("0"))
+                .and(SYS_MENU.STATUS.eq("1"))
+                .and(SYS_ROLE.STATUS.eq("1"))
                 .orderBy(SYS_MENU.PARENT_ID.asc(), SYS_MENU.ORDER_NUM.asc());
         }
         List<SysMenu> menus = this.list(queryWrapper);
@@ -309,7 +308,7 @@ public class SysMenuServiceImpl extends BaseServiceImpl<SysMenuMapper, SysMenu>
         List<RouterVo> routers = new LinkedList<RouterVo>();
         for (SysMenu menu : menus) {
             RouterVo router = new RouterVo();
-            router.setHidden("1".equals(menu.getVisible()));
+            router.setHidden("0".equals(menu.getVisible()));
             router.setName(getRouteName(menu));
             router.setPath(getRouterPath(menu));
             router.setComponent(getComponent(menu));

eco-modules/system/src/main/java/org/eco/system/service/impl/SysNoticeServiceImpl.java

@@ -24,7 +24,6 @@ import static org.eco.system.domain.table.SysNoticeTableDef.SYS_NOTICE;
  * 公告 服务层实现
  *
  * @author wgk
- * @author wgk
  */
 @Service
 public class SysNoticeServiceImpl extends BaseServiceImpl<SysNoticeMapper, SysNotice> implements ISysNoticeService {

eco-modules/system/src/main/java/org/eco/system/service/impl/SysOperLogServiceImpl.java

@@ -28,7 +28,6 @@ import static org.eco.system.domain.table.SysOperLogTableDef.SYS_OPER_LOG;
  * 操作日志 服务层处理
  *
  * @author wgk
- * @author wgk
  */
 @Service
 public class SysOperLogServiceImpl extends BaseServiceImpl<SysOperLogMapper, SysOperLog> implements ISysOperLogService {
@@ -45,10 +44,11 @@ public class SysOperLogServiceImpl extends BaseServiceImpl<SysOperLogMapper, Sys
     @Async
     @EventListener
     public void recordLog(OperLogEvent operLogEvent) {
-        SysOperLogBo operLog = MapstructUtils.convert(operLogEvent, SysOperLogBo.class);
+        SysOperLogBo operaLog = MapstructUtils.convert(operLogEvent, SysOperLogBo.class);
         // 远程查询操作地点
-        operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp()));
-        insertOperlog(operLog);
+        assert operaLog != null;
+        operaLog.setOperLocation(AddressUtils.getRealAddressByIP(operaLog.getOperIp()));
+        insertOperlog(operaLog);
     }
 
     /**
@@ -59,6 +59,7 @@ public class SysOperLogServiceImpl extends BaseServiceImpl<SysOperLogMapper, Sys
     @Override
     public void insertOperlog(SysOperLogBo operLogBo) {
         SysOperLog operLog = MapstructUtils.convert(operLogBo, SysOperLog.class);
+        assert operLog != null;
         operLog.setOperTime(new Date());
         this.save(operLog);
     }
@@ -66,7 +67,7 @@ public class SysOperLogServiceImpl extends BaseServiceImpl<SysOperLogMapper, Sys
     /**
      * 根据operLogBo构建QueryWrapper查询条件
      *
-     * @param operLogBo
+     * @param operLogBo 操作日志信息
      * @return 查询条件
      */
     private QueryWrapper buildQueryWrapper(SysOperLogBo operLogBo) {
@@ -113,24 +114,24 @@ public class SysOperLogServiceImpl extends BaseServiceImpl<SysOperLogMapper, Sys
      * 批量删除系统操作日志
      * delete from sys_oper_log where oper_id in
      *
-     * @param operIds 需要删除的操作日志ID
+     * @param operaIds 需要删除的操作日志ID
      * @return 结果:true 删除成功，false 删除失败。
      */
     @Override
-    public boolean deleteOperLogByIds(Long[] operIds) {
-        return this.removeByIds(Arrays.asList(operIds));
+    public boolean deleteOperLogByIds(Long[] operaIds) {
+        return this.removeByIds(Arrays.asList(operaIds));
     }
 
     /**
      * 查询操作日志详细
      *
-     * @param operId 操作ID
+     * @param operaId 操作ID
      * @return 操作日志对象
      */
     @Override
-    public SysOperLogVo selectOperLogById(Long operId) {
+    public SysOperLogVo selectOperLogById(Long operaId) {
         QueryWrapper queryWrapper = query();
-        queryWrapper.where(SYS_OPER_LOG.OPER_ID.eq(operId));
+        queryWrapper.where(SYS_OPER_LOG.OPER_ID.eq(operaId));
         return this.getOneAs(queryWrapper, SysOperLogVo.class);
     }
 

eco-modules/system/src/main/java/org/eco/system/service/impl/SysOssConfigServiceImpl.java

@@ -72,17 +72,16 @@ public class SysOssConfigServiceImpl extends BaseServiceImpl<SysOssConfigMapper,
     /**
      * 根据bo构建QueryWrapper查询条件
      *
-     * @param bo
+     * @param bo oss信息
      * @return 查询条件
      */
     private QueryWrapper buildQueryWrapper(SysOssConfigBo bo) {
-        QueryWrapper queryWrapper = super.buildBaseQueryWrapper()
+
+        return super.buildBaseQueryWrapper()
             .and(SYS_OSS_CONFIG.CONFIG_KEY.eq(bo.getConfigKey()))
             .and(SYS_OSS_CONFIG.BUCKET_NAME.like(bo.getBucketName()))
             .and(SYS_OSS_CONFIG.STATUS.eq(bo.getStatus()))
             .orderBy(SYS_OSS_CONFIG.OSS_CONFIG_ID.asc());
-
-        return queryWrapper;
     }
 
     @Override
@@ -96,6 +95,7 @@ public class SysOssConfigServiceImpl extends BaseServiceImpl<SysOssConfigMapper,
     @Override
     public Boolean insertByBo(SysOssConfigBo bo) {
         SysOssConfig config = MapstructUtils.convert(bo, SysOssConfig.class);
+        assert config != null;
         validEntityBeforeSave(config);
         boolean flag = this.save(config);
         if (flag) {
@@ -109,6 +109,7 @@ public class SysOssConfigServiceImpl extends BaseServiceImpl<SysOssConfigMapper,
     @Override
     public Boolean updateByBo(SysOssConfigBo bo) {
         SysOssConfig config = MapstructUtils.convert(bo, SysOssConfig.class);
+        assert config != null;
         validEntityBeforeSave(config);
         boolean flag = this.updateById(config);
         if (flag) {

eco-modules/system/src/main/java/org/eco/system/service/impl/SysPostServiceImpl.java

@@ -30,7 +30,6 @@ import static org.eco.system.domain.table.SysUserTableDef.SYS_USER;
  * 岗位信息 服务层处理
  *
  * @author wgk
- * @author wgk
  */
 @Service
 public class SysPostServiceImpl extends BaseServiceImpl<SysPostMapper, SysPost> implements ISysPostService {

eco-modules/system/src/main/java/org/eco/system/service/impl/SysRoleMenuServiceImpl.java

@@ -17,7 +17,6 @@ import static org.eco.system.domain.table.SysRoleMenuTableDef.SYS_ROLE_MENU;
  * SysRoleMenu服务实现类
  *
  * @author wgk
- * @author wgk
  */
 @Service
 public class SysRoleMenuServiceImpl extends BaseServiceImpl<SysRoleMenuMapper, SysRoleMenu> implements ISysRoleMenuService {

eco-modules/system/src/main/java/org/eco/system/service/impl/SysRoleServiceImpl.java

@@ -50,7 +50,6 @@ import static org.eco.system.domain.table.SysUserTableDef.SYS_USER;
  * 角色 业务层处理
  *
  * @author wgk
- * @author wgk
  */
 @Service
 public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService {
@@ -553,7 +552,7 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleMapper, SysRole>
             .leftJoin(SYS_USER_ROLE).as("ur").on(SYS_USER_ROLE.ROLE_ID.eq(SYS_ROLE.ROLE_ID))
             .leftJoin(SYS_USER).as("u").on(SYS_USER.USER_ID.eq(SYS_USER_ROLE.USER_ID))
             .leftJoin(SYS_DEPT).as("d").on(SYS_DEPT.DEPT_ID.eq(SYS_USER.DEPT_ID))
-            .where(SYS_ROLE.DEL_FLAG.eq(0))
+            .where(SYS_ROLE.DEL_FLAG.eq(1))
             .and(SYS_USER.USER_NAME.eq(userName));
         return this.listAs(queryWrapper, SysRoleVo.class);
     }

eco-modules/system/src/main/java/org/eco/system/service/impl/SysUserRoleServiceImpl.java

@@ -19,7 +19,6 @@ import static org.eco.system.domain.table.SysUserRoleTableDef.SYS_USER_ROLE;
  * SysUserRoleService实现类
  *
  * @author wgk
- * @author wgk
  */
 @Service
 public class SysUserRoleServiceImpl extends BaseServiceImpl<SysUserRoleMapper, SysUserRole> implements ISysUserRoleService {

eco-modules/system/src/main/java/org/eco/system/service/impl/SysUserServiceImpl.java

@@ -59,7 +59,6 @@ import static org.eco.system.domain.table.SysUserTableDef.SYS_USER;
  * 用户 业务层处理
  *
  * @author wgk
- * @author wgk
  */
 @Service
 @Slf4j
@@ -95,7 +94,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
             .select(SYS_USER.USER_ID, SYS_USER.TENANT_ID, SYS_USER.DEPT_ID, SYS_USER.NICK_NAME, SYS_USER.USER_NAME, SYS_USER.USER_TYPE, SYS_USER.EMAIL, SYS_USER.AVATAR, SYS_USER.PHONENUMBER, SYS_USER.GENDER, SYS_USER.STATUS, SYS_USER.VERSION, SYS_USER.DEL_FLAG, SYS_USER.LOGIN_IP, SYS_USER.LOGIN_DATE, SYS_USER.CREATE_BY, SYS_USER.CREATE_TIME, SYS_USER.REMARK, SYS_DEPT.DEPT_NAME, SYS_DEPT.LEADER)
             .from(SYS_USER.as("u"))
             .leftJoin(SYS_DEPT).as("d").on(SYS_DEPT.DEPT_ID.eq(SYS_USER.DEPT_ID))
-            .where(SYS_USER.DEL_FLAG.eq(0));
+            .where(SYS_USER.DEL_FLAG.eq(1));
         if (ObjectUtil.isNotNull(userBo.getUserId())) {
             queryWrapper.and(SYS_USER.USER_ID.eq(userBo.getUserId()));
         }
@@ -126,7 +125,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
             ))
             .from(SYS_USER.as("u"))
             .leftJoin(SYS_DEPT).as("d").on(SYS_DEPT.DEPT_ID.eq(SYS_USER.DEPT_ID))
-            .where(SYS_USER.DEL_FLAG.eq(0));
+            .where(SYS_USER.DEL_FLAG.eq(1));
     }
 
 
@@ -169,7 +168,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
             .leftJoin(SYS_DEPT).as("d").on(SYS_DEPT.DEPT_ID.eq(SYS_USER.DEPT_ID))
             .leftJoin(SYS_USER_ROLE).as("ur").on(SYS_USER_ROLE.USER_ID.eq(SYS_USER.USER_ID))
             .leftJoin(SYS_ROLE).as("r").on(SYS_ROLE.ROLE_ID.eq(SYS_USER_ROLE.ROLE_ID))
-            .where(SYS_USER.DEL_FLAG.eq(0))
+            .where(SYS_USER.DEL_FLAG.eq(1))
             .and(SYS_ROLE.ROLE_ID.eq(userBo.getRoleId()));
         if (StringUtils.isNotEmpty(userBo.getUserName())) {
             queryWrapper.and(SYS_USER.USER_NAME.like(userBo.getUserName()));
@@ -196,8 +195,8 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
             .leftJoin(SYS_DEPT).as("d").on(SYS_DEPT.DEPT_ID.eq(SYS_USER.DEPT_ID))
             .leftJoin(SYS_USER_ROLE).as("ur").on(SYS_USER_ROLE.USER_ID.eq(SYS_USER.USER_ID))
             .leftJoin(SYS_ROLE).as("r").on(SYS_ROLE.ROLE_ID.eq(SYS_USER_ROLE.ROLE_ID))
-            .where(SYS_USER.DEL_FLAG.eq(0))
-            .and(SYS_USER.STATUS.eq("0"))
+            .where(SYS_USER.DEL_FLAG.eq(1))
+            .and(SYS_USER.STATUS.eq("1"))
             .and(SYS_ROLE.ROLE_ID.ne(userBo.getRoleId()).or(SYS_ROLE.ROLE_ID.isNull()))
             .and(SYS_USER.USER_ID.notIn(select(SYS_USER.USER_ID).from(SYS_USER.as("u")).innerJoin(SYS_USER_ROLE).as("ur").on(SYS_USER_ROLE.USER_ID.eq(SYS_USER.USER_ID).and(SYS_USER_ROLE.ROLE_ID.eq(userBo.getRoleId())))));
         if (StringUtils.isNotEmpty(userBo.getUserName())) {
@@ -220,7 +219,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
     @Override
     public SysUserVo selectUserByUserName(String userName) {
         QueryWrapper queryWrapper = buildOneQueryWrapper();
-        queryWrapper.where(SYS_USER.DEL_FLAG.eq(0));
+        queryWrapper.where(SYS_USER.DEL_FLAG.eq(1));
         if (StringUtils.isNotEmpty(userName)) {
             queryWrapper.and(SYS_USER.USER_NAME.eq(userName));
         }
@@ -253,7 +252,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
     @Override
     public SysUserVo selectUserByEmail(String email) {
         QueryWrapper queryWrapper = buildOneQueryWrapper();
-        queryWrapper.where(SYS_USER.DEL_FLAG.eq(0));
+        queryWrapper.where(SYS_USER.DEL_FLAG.eq(1));
         if (StringUtils.isNotEmpty(email)) {
             queryWrapper.and(SYS_USER.EMAIL.eq(email));
         }
@@ -292,7 +291,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
             ))
             .from(SYS_USER.as("u"))
             .leftJoin(SYS_DEPT).as("d").on(SYS_DEPT.DEPT_ID.eq(SYS_USER.DEPT_ID))
-            .where(SYS_USER.DEL_FLAG.eq(0));
+            .where(SYS_USER.DEL_FLAG.eq(1));
         if (ObjectUtil.isNotNull(userId)) {
             queryWrapper.and(SYS_USER.USER_ID.eq(userId));
         }
@@ -339,7 +338,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
     public boolean checkUserNameUnique(SysUserBo userBo) {
         Long userId = ObjectUtil.isNull(userBo.getUserId()) ? -1L : userBo.getUserId();
         QueryWrapper queryWrapper = query().where(SYS_USER.USER_NAME.eq(userBo.getUserName()))
-            .and(SYS_USER.DEL_FLAG.eq(0));
+            .and(SYS_USER.DEL_FLAG.eq(1));
         SysUser info = this.getOne(queryWrapper);
         if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
             return UserConstants.NOT_UNIQUE;
@@ -357,7 +356,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
     public boolean checkPhoneUnique(SysUserBo user) {
         Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
         QueryWrapper queryWrapper = query().where(SYS_USER.PHONENUMBER.eq(user.getPhonenumber()))
-            .and(SYS_USER.DEL_FLAG.eq(0));
+            .and(SYS_USER.DEL_FLAG.eq(1));
         SysUser info = this.getOne(queryWrapper);
         if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
             return UserConstants.NOT_UNIQUE;
@@ -375,7 +374,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
     public boolean checkEmailUnique(SysUserBo user) {
         long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
         QueryWrapper queryWrapper = query().where(SYS_USER.EMAIL.eq(user.getEmail()))
-            .and(SYS_USER.DEL_FLAG.eq(0));
+            .and(SYS_USER.DEL_FLAG.eq(1));
         SysUser info = this.getOne(queryWrapper);
         if (StringUtils.isNotNull(info) && info.getUserId() != userId) {
             return UserConstants.NOT_UNIQUE;
@@ -429,7 +428,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
             .select(QueryMethods.count(SYS_USER.USER_ID))
             .from(SYS_USER)
             .where(SYS_USER.DEPT_ID.eq(deptId))
-            .and(SYS_USER.DEL_FLAG.eq(0));
+            .and(SYS_USER.DEL_FLAG.eq(1));
 
         int result = userMapper.selectObjectByQueryAs(queryWrapper, Integer.class);
         return result > 0;
@@ -701,7 +700,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
      */
     @Override
     public List<SysUserVo> selectUserListByDept(Long deptId) {
-        QueryWrapper queryWrapper = query().where(SYS_USER.DEPT_ID.eq(deptId)).and(SYS_USER.DEL_FLAG.eq(0));
+        QueryWrapper queryWrapper = query().where(SYS_USER.DEPT_ID.eq(deptId)).and(SYS_USER.DEL_FLAG.eq(1));
         return this.listAs(queryWrapper, SysUserVo.class);
     }
 }

eco-start/src/main/resources/application.yml

@@ -151,10 +151,10 @@ mybatis-flex:
     key-config:
       key-type: Generator
       value: snowFlakeId
-    # 逻辑未删除值
-    normal-value-of-logic-delete: 0
-    # 逻辑已删除值(框架表均使用此值 禁止随意修改)
-    deleted-value-of-logic-delete: 1
+    # 逻辑未删除值1
+    normal-value-of-logic-delete: 1
+    # 逻辑已删除值0 1:存在(框架表均使用此值 禁止随意修改)
+    deleted-value-of-logic-delete: 0
     # 默认的逻辑删除字段
     logic-delete-column: del_flag
     # 默认的多租户字段