所有值为[0,1]的status字段改为enable:[false,true]

java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/Msg.java

@@ -21,6 +21,6 @@ public class Msg implements Serializable {
     private String wname;
     private Long wtime;
     private Integer status;
-    private Integer broadcast;
+    private boolean broadcast = false;
     private String recipient;
 }

java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/RecLoginHistory.java

@@ -18,6 +18,6 @@ public class RecLoginHistory implements Serializable {
     private String uname;
     private String ip;
     private String address;
-    private Integer type;
+    private boolean login = false;
     private Long time;
 }

java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/RecUserAction.java

@@ -21,5 +21,5 @@ public class RecUserAction implements Serializable {
     private Long time;
     private String action;
     private String error;
-    private Integer type;
+    private boolean success = false;
 }

java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/SysCategory.java

@@ -10,6 +10,6 @@ public class SysCategory implements Serializable {
     private Integer id;
     private Integer pid;
     private String name;
-    private Integer type;
+    private boolean leaf = false;
     private Long ctime;
 }

java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/SysCustomer.java

@@ -13,7 +13,7 @@ public class SysCustomer implements Serializable {
     private String linkman;
     private String linkphone;
     private String region;
-    private Integer status;
+    private boolean enable = false;
     private Long ctime;
     private String remark;
 }

java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/SysDepartment.java

@@ -10,5 +10,5 @@ public class SysDepartment implements Serializable {
     private Integer id;
     private Integer pid;
     private String name;
-    private Integer status;
+    private boolean enable = false;
 }

java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/SysRole.java

@@ -13,7 +13,7 @@ public class SysRole implements Serializable {
     private Integer cid;
     private String cname;
     private Long ctime;
-    private Integer status;
+    private boolean enable = false;
     private int scope = DataScopeEnum.ALL.getCode();
     private String departmentId;
     private String resourceId;

java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/SysSupplier.java

@@ -13,7 +13,7 @@ public class SysSupplier implements Serializable {
     private String linkman;
     private String linkphone;
     private String region;
-    private Integer status;
+    private boolean enable = false;
     private Long ctime;
     private String remark;
 }

java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/SysUser.java

@@ -1,8 +1,6 @@
 package cn.toesbieya.jxc.common.model.entity;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -16,6 +14,6 @@ public class SysUser implements Serializable {
     private String avatar;
     private Long ctime;
     private boolean admin = false;
-    private Integer status;
+    private boolean enable = false;
     private Integer dept;
 }

java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/aspect/RestExceptionAspect.java

@@ -5,7 +5,6 @@ import cn.toesbieya.jxc.common.exception.JsonResultException;
 import cn.toesbieya.jxc.common.model.entity.RecUserAction;
 import cn.toesbieya.jxc.common.model.vo.R;
 import cn.toesbieya.jxc.common.util.Util;
-import cn.toesbieya.jxc.web.common.enumeration.UserActionEnum;
 import cn.toesbieya.jxc.web.common.util.ThreadUtil;
 import cn.toesbieya.jxc.web.common.util.WebUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -72,7 +71,7 @@ public class RestExceptionAspect {
         if (action != null && !StringUtils.isEmpty(action.getAction())) {
             action.setTime(System.currentTimeMillis());
             action.setError(Util.exception2Str(e));
-            action.setType(UserActionEnum.FAIL.getCode());
+            action.setSuccess(false);
             recordApi.insertUserAction(action);
         }
         ThreadUtil.clearAll();

java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/aspect/UserActionAspect.java

@@ -5,7 +5,6 @@ import cn.toesbieya.jxc.common.model.entity.RecUserAction;
 import cn.toesbieya.jxc.common.model.vo.R;
 import cn.toesbieya.jxc.common.util.SpringUtil;
 import cn.toesbieya.jxc.web.common.annoation.UserAction;
-import cn.toesbieya.jxc.web.common.enumeration.UserActionEnum;
 import cn.toesbieya.jxc.web.common.util.ThreadUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.Reference;
@@ -59,11 +58,8 @@ public class UserActionAspect {
 
         R result = (R) pjp.proceed();
 
-        if (result.isSuccess()) {
-            action.setType(UserActionEnum.SUCCESS.getCode());
-        }
-        else {
-            action.setType(UserActionEnum.FAIL.getCode());
+        action.setSuccess(result.isSuccess());
+        if (!result.isSuccess()) {
             action.setError(result.getMsg());
         }
 

java/cloud/web/web-modules/account/src/main/java/cn/toesbieya/jxc/account/service/AccountService.java

@@ -1,6 +1,5 @@
 package cn.toesbieya.jxc.account.service;
 
-import cn.toesbieya.jxc.account.enumeration.RecLoginHistoryEnum;
 import cn.toesbieya.jxc.account.mapper.SysUserMapper;
 import cn.toesbieya.jxc.account.vo.LoginParam;
 import cn.toesbieya.jxc.account.vo.LoginSuccessInfo;
@@ -11,7 +10,6 @@ import cn.toesbieya.jxc.api.RecordApi;
 import cn.toesbieya.jxc.api.system.DepartmentApi;
 import cn.toesbieya.jxc.api.system.ResourceApi;
 import cn.toesbieya.jxc.api.system.RoleApi;
-import cn.toesbieya.jxc.common.enumeration.GeneralStatusEnum;
 import cn.toesbieya.jxc.common.enumeration.ResourceTypeEnum;
 import cn.toesbieya.jxc.common.model.entity.RecLoginHistory;
 import cn.toesbieya.jxc.common.model.entity.SysResource;
@@ -61,7 +59,7 @@ public class AccountService {
         if (user == null) {
             return R.fail("用户名或密码错误");
         }
-        if (user.getStatus().equals(GeneralStatusEnum.DISABLED.getCode())) {
+        if (!user.isEnable()) {
             return R.fail("该用户已被禁用，请联系管理员");
         }
         Integer roleId = user.getRole();
@@ -142,7 +140,7 @@ public class AccountService {
                         .uid(user.getId())
                         .uname(user.getName())
                         .ip(ip)
-                        .type(RecLoginHistoryEnum.LOGIN.getCode())
+                        .login(true)
                         .time(now)
                         .build()
         );
@@ -158,7 +156,7 @@ public class AccountService {
                             .uid(user.getId())
                             .uname(user.getName())
                             .ip(ip)
-                            .type(RecLoginHistoryEnum.LOGOUT.getCode())
+                            .login(false)
                             .time(System.currentTimeMillis())
                             .build()
             );
@@ -180,7 +178,7 @@ public class AccountService {
         user.setPwd(param.getPassword());
         user.setRole(1);
         user.setDept(1);
-        user.setStatus(GeneralStatusEnum.ENABLED.getCode());
+        user.setEnable(true);
         user.setCtime(System.currentTimeMillis());
 
         userMapper.insert(user);

java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/constant/MsgConstant.java

@@ -1,11 +1,7 @@
 package cn.toesbieya.jxc.message.constant;
 
 public interface MsgConstant {
-    Integer TYPE_NOTICE = 0;         //通知提醒
-    Integer TYPE_ANNOUNCEMENT = 1;   //系统公告
     Integer STATUS_DRAFT = 0;        //拟定
     Integer STATUS_PUBLISHED = 1;    //已发布
     Integer STATUS_WITHDREW = 2;     //已撤回
-    Integer TO_ALL = 1;              //发送给全体用户
-    Integer TO_RANGE = 0;            //已发送给指定用户
 }

java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/controller/ManageController.java

@@ -94,8 +94,7 @@ public class ManageController {
     private String validateAdd(Msg msg) {
         if (StringUtils.isEmpty(msg.getTitle())
                 || msg.getType() == null
-                || msg.getBroadcast() == null
-                || msg.getBroadcast().equals(MsgConstant.TO_RANGE) && StringUtils.isEmpty(msg.getRecipient())
+                || !msg.isBroadcast() && StringUtils.isEmpty(msg.getRecipient())
         ) return "参数错误";
         return null;
     }

java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/service/ManageService.java

@@ -63,7 +63,7 @@ public class ManageService {
                         .set(Msg::getWname, msg.getWname())
                         .set(Msg::getWtime, msg.getWtime())
                         .set(Msg::getStatus, msg.getStatus())
-                        .set(Msg::getBroadcast, msg.getBroadcast())
+                        .set(Msg::isBroadcast, msg.isBroadcast())
                         .set(Msg::getRecipient, msg.getRecipient())
                         .eq(Msg::getId, msg.getId())
         );
@@ -83,7 +83,7 @@ public class ManageService {
             eventVo.setEvent(SocketConstant.EVENT_NEW_MESSAGE);
 
             //发送websocket消息
-            if (msg.getBroadcast().equals(MsgConstant.TO_ALL)) {
+            if (msg.isBroadcast()) {
                 eventVo.setType(SocketConstant.REDIS_EVENT_BROADCAST);
                 WebSocketUtil.sendEvent(eventVo);
             }

java/cloud/web/web-modules/record/src/main/java/cn/toesbieya/jxc/record/model/vo/LoginHistorySearch.java

@@ -11,7 +11,7 @@ import lombok.ToString;
 public class LoginHistorySearch extends BaseSearch {
     private Integer uid;
     private String uname;
-    private Integer type;
+    private Boolean login;
     private String ip;
     private String address;
     private Long endTime;

java/cloud/web/web-modules/record/src/main/java/cn/toesbieya/jxc/record/model/vo/UserActionSearch.java

@@ -15,5 +15,5 @@ public class UserActionSearch extends BaseSearch {
     private String url;
     private Long startTime;
     private Long endTime;
-    private String type;
+    private Boolean success;
 }

java/cloud/web/web-modules/record/src/main/java/cn/toesbieya/jxc/record/service/RecordService.java

@@ -42,7 +42,7 @@ public class RecordService implements RecordApi {
     public PageResult<RecLoginHistory> searchLoginHistory(LoginHistorySearch vo) {
         Integer uid = vo.getUid();
         String uname = vo.getUname();
-        Integer type = vo.getType();
+        Boolean login = vo.getLogin();
         String ip = vo.getIp();
         String address = vo.getAddress();
         Long startTime = vo.getStartTime();
@@ -52,7 +52,7 @@ public class RecordService implements RecordApi {
                 Wrappers.lambdaQuery(RecLoginHistory.class)
                         .eq(uid != null, RecLoginHistory::getUid, uid)
                         .like(!StringUtils.isEmpty(uname), RecLoginHistory::getUname, vo.getUname())
-                        .eq(type != null, RecLoginHistory::getType, type)
+                        .eq(login != null, RecLoginHistory::isLogin, login)
                         .eq(!StringUtils.isEmpty(ip), RecLoginHistory::getIp, vo.getIp())
                         .like(!StringUtils.isEmpty(address), RecLoginHistory::getAddress, vo.getAddress())
                         .ge(startTime != null, RecLoginHistory::getTime, startTime)
@@ -66,7 +66,7 @@ public class RecordService implements RecordApi {
     public PageResult<RecUserAction> searchUserAction(UserActionSearch vo) {
         Integer uid = vo.getUid();
         String uname = vo.getUname();
-        String type = vo.getType();
+        Boolean success = vo.getSuccess();
         String ip = vo.getIp();
         String url = vo.getUrl();
         Long startTime = vo.getStartTime();
@@ -76,7 +76,7 @@ public class RecordService implements RecordApi {
                 Wrappers.lambdaQuery(RecUserAction.class)
                         .eq(uid != null, RecUserAction::getUid, uid)
                         .like(!StringUtils.isEmpty(uname), RecUserAction::getUname, uname)
-                        .inSql(!StringUtils.isEmpty(type), RecUserAction::getType, type)
+                        .eq(success != null, RecUserAction::isSuccess, success)
                         .eq(!StringUtils.isEmpty(ip), RecUserAction::getIp, ip)
                         .eq(!StringUtils.isEmpty(url), RecUserAction::getUrl, url)
                         .ge(startTime != null, RecUserAction::getTime, startTime)

java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/CategoryController.java

@@ -59,9 +59,6 @@ public class CategoryController {
         if (StringUtils.isEmpty(category.getName())) {
             return "创建失败，分类名称不能为空";
         }
-        if (category.getType() == null) {
-            return "创建失败，分类类型不能为空";
-        }
         return null;
     }
 
@@ -72,9 +69,6 @@ public class CategoryController {
         if (StringUtils.isEmpty(category.getName())) {
             return "创建失败，分类名称不能为空";
         }
-        if (category.getType() == null) {
-            return "创建失败，分类类型不能为空";
-        }
         return null;
     }
 }

java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/CustomerController.java

@@ -55,7 +55,6 @@ public class CustomerController {
         if (StringUtils.isEmpty(customer.getAddress())) return "客户地址不能为空";
         if (StringUtils.isEmpty(customer.getLinkman())) return "客户联系人不能为空";
         if (StringUtils.isEmpty(customer.getLinkphone())) return "客户联系电话不能为空";
-        if (customer.getStatus() == null) return "客户状态不能为空";
         return null;
     }
 

java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/DepartmentController.java

@@ -1,6 +1,5 @@
 package cn.toesbieya.jxc.system.controller;
 
-import cn.toesbieya.jxc.common.enumeration.GeneralStatusEnum;
 import cn.toesbieya.jxc.common.model.entity.SysDepartment;
 import cn.toesbieya.jxc.common.model.vo.DepartmentVo;
 import cn.toesbieya.jxc.common.model.vo.R;
@@ -24,7 +23,7 @@ public class DepartmentController {
         if (!all) {
             list = list
                     .stream()
-                    .filter(i -> i.getStatus().equals(GeneralStatusEnum.ENABLED.getCode()))
+                    .filter(SysDepartment::isEnable)
                     .collect(Collectors.toList());
         }
         return R.success(list);
@@ -32,9 +31,7 @@ public class DepartmentController {
 
     @PostMapping("add")
     public R add(@RequestBody SysDepartment department) {
-        if (null == department.getPid()
-                || StringUtils.isEmpty(department.getName())
-                || null == department.getStatus()) {
+        if (null == department.getPid() || StringUtils.isEmpty(department.getName())) {
             return R.fail("添加失败，参数错误");
         }
 
@@ -47,8 +44,7 @@ public class DepartmentController {
     public R update(@RequestBody SysDepartment department) {
         if (null == department.getId()
                 || null == department.getPid()
-                || StringUtils.isEmpty(department.getName())
-                || null == department.getStatus()) {
+                || StringUtils.isEmpty(department.getName())) {
             return R.fail("修改失败，参数错误");
         }
 

java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/RoleController.java

@@ -29,8 +29,7 @@ public class RoleController {
 
     @PostMapping("add")
     public R add(@RequestBody SysRole role) {
-        if (StringUtils.isEmpty(role.getName())
-                || role.getStatus() == null) {
+        if (StringUtils.isEmpty(role.getName())) {
             return R.fail("添加失败，参数错误");
         }
 
@@ -46,9 +45,7 @@ public class RoleController {
 
     @PostMapping("update")
     public R update(@RequestBody SysRole role) {
-        if (StringUtils.isEmpty(role.getName())
-                || role.getId() == null
-                || role.getStatus() == null) {
+        if (StringUtils.isEmpty(role.getName()) || role.getId() == null) {
             return R.fail("修改失败，参数错误");
         }
 

java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/SupplierController.java

@@ -53,7 +53,6 @@ public class SupplierController {
         if (StringUtils.isEmpty(supplier.getAddress())) return "供应商地址不能为空";
         if (StringUtils.isEmpty(supplier.getLinkman())) return "供应商联系人不能为空";
         if (StringUtils.isEmpty(supplier.getLinkphone())) return "供应商联系电话不能为空";
-        if (supplier.getStatus() == null) return "供应商状态不能为空";
         return null;
     }
 

java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/UserController.java

@@ -84,7 +84,6 @@ public class UserController {
         if (user.getId() == null) return "修改失败，参数错误";
         if (StringUtils.isEmpty(user.getName())) return "修改失败，用户名称不能为空";
         if (user.getRole() == null) return "修改失败，用户角色不能为空";
-        if (user.getStatus() == null) return "修改失败，用户状态不能为空";
         return null;
     }
 }

java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/model/vo/CategorySearch.java

@@ -9,7 +9,7 @@ public class CategorySearch {
     private Integer pid;
     private String pids;
     private String name;
-    private Integer type;
+    private Boolean leaf;
     private Long startTime;
     private Long endTime;
 }

java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/model/vo/CustomerSearch.java

@@ -15,7 +15,7 @@ public class CustomerSearch extends BaseSearch {
     private String linkman;
     private String linkphone;
     private String region;
-    private Integer status;
+    private Boolean enable;
     private Long startTime;
     private Long endTime;
 }

java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/model/vo/RoleSearch.java

@@ -13,7 +13,7 @@ public class RoleSearch extends BaseSearch {
     private String name;
     private Integer cid;
     private String cname;
-    private Integer status;
+    private Boolean enable;
     private Long startTime;
     private Long endTime;
 }

java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/model/vo/SupplierSearch.java

@@ -15,7 +15,7 @@ public class SupplierSearch extends BaseSearch {
     private String linkman;
     private String linkphone;
     private String region;
-    private Integer status;
+    private Boolean enable;
     private Long startTime;
     private Long endTime;
 }

java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/model/vo/UserSearch.java

@@ -14,5 +14,5 @@ public class UserSearch extends BaseSearch {
     private String role;
     private Long startTime;
     private Long endTime;
-    private Integer status;
+    private Boolean enable;
 }

java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/CategoryService.java

@@ -30,7 +30,7 @@ public class CategoryService {
         Integer pid = vo.getPid();
         String pids = vo.getPids();
         String name = vo.getName();
-        Integer type = vo.getType();
+        Boolean leaf = vo.getLeaf();
         Long startTime = vo.getStartTime();
         Long endTime = vo.getEndTime();
 
@@ -41,7 +41,7 @@ public class CategoryService {
                         .eq(pid != null, SysCategory::getPid, pid)
                         .inSql(!StringUtils.isEmpty(pids), SysCategory::getPid, pids)
                         .like(!StringUtils.isEmpty(name), SysCategory::getName, name)
-                        .eq(type != null, SysCategory::getType, type)
+                        .eq(leaf != null, SysCategory::isLeaf, leaf)
                         .ge(startTime != null, SysCategory::getCtime, startTime)
                         .le(endTime != null, SysCategory::getCtime, endTime)
                         .orderByDesc(SysCategory::getCtime)
@@ -69,7 +69,7 @@ public class CategoryService {
                 Wrappers.lambdaUpdate(SysCategory.class)
                         .set(SysCategory::getPid, category.getPid())
                         .set(SysCategory::getName, category.getName())
-                        .set(SysCategory::getType, category.getType())
+                        .set(SysCategory::isLeaf, category.isLeaf())
                         .eq(SysCategory::getId, category.getId())
         );
         return rows > 0 ? R.success("修改成功") : R.fail("修改失败，请刷新后重试");
@@ -93,7 +93,7 @@ public class CategoryService {
         //当该分类不是顶级节点时，判断其父节点是否允许有下级
         if (!category.getPid().equals(0)) {
             SysCategory parent = mapper.selectById(category.getPid());
-            if (parent == null || parent.getType() == 1) {
+            if (parent == null || parent.isLeaf()) {
                 return "父节点状态变更，请刷新后重试";
             }
         }
@@ -106,7 +106,7 @@ public class CategoryService {
         if (exist != null && exist > 0) {
             return String.format("分类【%s】已存在", category.getName());
         }
-        if (id != null && category.getType() == 1 && hasChildren(id)) {
+        if (id != null && category.isLeaf() && hasChildren(id)) {
             return "该分类下存在子节点，不能改为实体类型";
         }
         return null;

java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/CustomerService.java

@@ -38,7 +38,7 @@ public class CustomerService {
         String linkman = vo.getLinkman();
         String linkphone = vo.getLinkphone();
         String region = vo.getRegion();
-        Integer status = vo.getStatus();
+        Boolean enable = vo.getEnable();
         Long startTime = vo.getStartTime();
         Long endTime = vo.getEndTime();
 
@@ -50,7 +50,7 @@ public class CustomerService {
                         .like(!StringUtils.isEmpty(linkman), SysCustomer::getLinkman, linkman)
                         .eq(!StringUtils.isEmpty(linkphone), SysCustomer::getLinkphone, linkphone)
                         .inSql(!StringUtils.isEmpty(region), SysCustomer::getRegion, region)
-                        .eq(status != null, SysCustomer::getStatus, status)
+                        .eq(enable != null, SysCustomer::isEnable, enable)
                         .ge(startTime != null, SysCustomer::getCtime, startTime)
                         .le(endTime != null, SysCustomer::getCtime, endTime)
                         .orderByDesc(SysCustomer::getCtime);
@@ -111,7 +111,7 @@ public class CustomerService {
                         .set(SysCustomer::getLinkman, customer.getLinkman())
                         .set(SysCustomer::getLinkphone, customer.getLinkphone())
                         .set(SysCustomer::getRegion, customer.getRegion())
-                        .set(SysCustomer::getStatus, customer.getStatus())
+                        .set(SysCustomer::isEnable, customer.isEnable())
                         .set(SysCustomer::getRemark, customer.getRemark())
                         .eq(SysCustomer::getId, id)
         );
@@ -123,7 +123,7 @@ public class CustomerService {
         int rows = customerMapper.delete(
                 Wrappers.lambdaQuery(SysCustomer.class)
                         .eq(SysCustomer::getId, customer.getId())
-                        .eq(SysCustomer::getStatus, 0)
+                        .eq(SysCustomer::isEnable, false)
         );
         return rows > 0 ? R.success("删除成功") : R.fail("删除失败，请刷新重试");
     }

java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/RoleService.java

@@ -1,7 +1,6 @@
 package cn.toesbieya.jxc.system.service;
 
 import cn.toesbieya.jxc.api.system.RoleApi;
-import cn.toesbieya.jxc.common.enumeration.GeneralStatusEnum;
 import cn.toesbieya.jxc.common.model.entity.SysRole;
 import cn.toesbieya.jxc.common.model.vo.R;
 import cn.toesbieya.jxc.system.mapper.SysRoleMapper;
@@ -26,7 +25,7 @@ public class RoleService implements RoleApi {
     public List<SysRole> get() {
         return mapper.selectList(
                 Wrappers.lambdaQuery(SysRole.class)
-                        .eq(SysRole::getStatus, GeneralStatusEnum.ENABLED.getCode())
+                        .eq(SysRole::isEnable, true)
         );
     }
 
@@ -40,7 +39,7 @@ public class RoleService implements RoleApi {
         String name = vo.getName();
         Integer cid = vo.getCid();
         String cname = vo.getCname();
-        Integer status = vo.getStatus();
+        Boolean enable = vo.getEnable();
         Long startTime = vo.getStartTime();
         Long endTime = vo.getEndTime();
 
@@ -50,7 +49,7 @@ public class RoleService implements RoleApi {
                         .like(!StringUtils.isEmpty(name), SysRole::getName, name)
                         .eq(cid != null, SysRole::getCid, cid)
                         .like(!StringUtils.isEmpty(cname), SysRole::getName, cname)
-                        .eq(status != null, SysRole::getStatus, status)
+                        .eq(enable != null, SysRole::isEnable, enable)
                         .ge(startTime != null, SysRole::getCtime, startTime)
                         .le(endTime != null, SysRole::getCtime, endTime)
                         .orderByDesc(SysRole::getCtime);
@@ -82,7 +81,7 @@ public class RoleService implements RoleApi {
                 null,
                 Wrappers.lambdaUpdate(SysRole.class)
                         .set(SysRole::getName, name)
-                        .set(SysRole::getStatus, role.getStatus())
+                        .set(SysRole::isEnable, role.isEnable())
                         .set(SysRole::getScope, role.getScope())
                         .set(SysRole::getDepartmentId, role.getDepartmentId())
                         .set(SysRole::getResourceId, role.getResourceId())
@@ -96,7 +95,7 @@ public class RoleService implements RoleApi {
         int rows = mapper.delete(
                 Wrappers.lambdaQuery(SysRole.class)
                         .eq(SysRole::getId, role.getId())
-                        .eq(SysRole::getStatus, 0)
+                        .eq(SysRole::isEnable, false)
         );
         return rows > 0 ? R.success("删除成功") : R.fail("删除失败，请刷新重试");
     }

java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/SupplierService.java

@@ -1,6 +1,5 @@
 package cn.toesbieya.jxc.system.service;
 
-import cn.toesbieya.jxc.common.enumeration.GeneralStatusEnum;
 import cn.toesbieya.jxc.common.model.entity.SysRegion;
 import cn.toesbieya.jxc.common.model.entity.SysSupplier;
 import cn.toesbieya.jxc.common.model.vo.R;
@@ -39,7 +38,7 @@ public class SupplierService {
         String linkman = vo.getLinkman();
         String linkphone = vo.getLinkphone();
         String region = vo.getRegion();
-        Integer status = vo.getStatus();
+        Boolean enable = vo.getEnable();
         Long startTime = vo.getStartTime();
         Long endTime = vo.getEndTime();
 
@@ -51,7 +50,7 @@ public class SupplierService {
                         .like(!StringUtils.isEmpty(linkman), SysSupplier::getLinkman, linkman)
                         .eq(!StringUtils.isEmpty(linkphone), SysSupplier::getLinkphone, linkphone)
                         .inSql(!StringUtils.isEmpty(region), SysSupplier::getRegion, region)
-                        .eq(status != null, SysSupplier::getStatus, status)
+                        .eq(enable != null, SysSupplier::isEnable, enable)
                         .ge(startTime != null, SysSupplier::getCtime, startTime)
                         .le(endTime != null, SysSupplier::getCtime, endTime)
                         .orderByDesc(SysSupplier::getCtime);
@@ -111,7 +110,7 @@ public class SupplierService {
                         .set(SysSupplier::getLinkman, supplier.getLinkman())
                         .set(SysSupplier::getLinkphone, supplier.getLinkphone())
                         .set(SysSupplier::getRegion, supplier.getRegion())
-                        .set(SysSupplier::getStatus, supplier.getStatus())
+                        .set(SysSupplier::isEnable, supplier.isEnable())
                         .set(SysSupplier::getRemark, supplier.getRemark())
                         .eq(SysSupplier::getId, id)
         );
@@ -123,7 +122,7 @@ public class SupplierService {
         int rows = supplierMapper.delete(
                 Wrappers.lambdaQuery(SysSupplier.class)
                         .eq(SysSupplier::getId, supplier.getId())
-                        .eq(SysSupplier::getStatus, GeneralStatusEnum.DISABLED.getCode())
+                        .eq(SysSupplier::isEnable, false)
         );
         return rows > 0 ? R.success("删除成功") : R.fail("删除失败，请刷新重试");
     }

java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/UserService.java

@@ -38,17 +38,17 @@ public class UserService {
         Integer id = vo.getId();
         String name = vo.getName();
         String roleIds = vo.getRole();
-        Integer status = vo.getStatus();
+        Boolean enable = vo.getEnable();
         Long startTime = vo.getStartTime();
         Long endTime = vo.getEndTime();
 
         Wrapper<SysUser> wrapper =
                 Wrappers.lambdaQuery(SysUser.class)
-                        .eq(SysUser::isAdmin, 0)
+                        .eq(SysUser::isAdmin, false)
                         .eq(id != null, SysUser::getId, id)
                         .like(!StringUtils.isEmpty(name), SysUser::getName, name)
                         .inSql(!StringUtils.isEmpty(roleIds), SysUser::getRole, roleIds)
-                        .eq(status != null, SysUser::getStatus, status)
+                        .eq(enable != null, SysUser::isEnable, enable)
                         .ge(startTime != null, SysUser::getCtime, startTime)
                         .le(endTime != null, SysUser::getCtime, endTime)
                         .orderByDesc(SysUser::getCtime);
@@ -136,7 +136,7 @@ public class UserService {
                         .set(SysUser::getName, name)
                         .set(SysUser::getRole, user.getRole())
                         .set(SysUser::getDept, user.getDept())
-                        .set(SysUser::getStatus, user.getStatus())
+                        .set(SysUser::isEnable, user.isEnable())
                         .eq(SysUser::getId, id)
         );
 
@@ -149,7 +149,7 @@ public class UserService {
         int rows = userMapper.delete(
                 Wrappers.lambdaQuery(SysUser.class)
                         .eq(SysUser::getId, user.getId())
-                        .eq(SysUser::isAdmin, 0)
+                        .eq(SysUser::isAdmin, false)
         );
         WebSocketUtil.sendLogoutEvent(Collections.singletonList(user.getId()), "该用户已删除");
         return rows > 0 ? R.success("删除成功") : R.fail("删除失败，请刷新后重试");

java/local/src/main/java/cn/toesbieya/jxc/aspect/RestExceptionAspect.java

@@ -1,6 +1,5 @@
 package cn.toesbieya.jxc.aspect;
 
-import cn.toesbieya.jxc.enumeration.UserActionEnum;
 import cn.toesbieya.jxc.exception.JsonResultException;
 import cn.toesbieya.jxc.model.entity.RecUserAction;
 import cn.toesbieya.jxc.model.vo.R;
@@ -73,7 +72,7 @@ public class RestExceptionAspect {
         if (action != null && !StringUtils.isEmpty(action.getAction())) {
             action.setTime(System.currentTimeMillis());
             action.setError(Util.exception2Str(e));
-            action.setType(UserActionEnum.FAIL.getCode());
+            action.setSuccess(false);
             service.insertUserAction(action);
         }
         ThreadUtil.clearAll();

java/local/src/main/java/cn/toesbieya/jxc/aspect/UserActionAspect.java

@@ -1,10 +1,9 @@
 package cn.toesbieya.jxc.aspect;
 
 import cn.toesbieya.jxc.annoation.UserAction;
-import cn.toesbieya.jxc.enumeration.UserActionEnum;
 import cn.toesbieya.jxc.model.entity.RecUserAction;
-import cn.toesbieya.jxc.service.RecService;
 import cn.toesbieya.jxc.model.vo.R;
+import cn.toesbieya.jxc.service.RecService;
 import cn.toesbieya.jxc.util.SpringUtil;
 import cn.toesbieya.jxc.util.ThreadUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -59,14 +58,10 @@ public class UserActionAspect {
 
         R result = (R) pjp.proceed();
 
-        if (result.isSuccess()) {
-            action.setType(UserActionEnum.SUCCESS.getCode());
-        }
-        else {
-            action.setType(UserActionEnum.FAIL.getCode());
+        action.setSuccess(result.isSuccess());
+        if (!result.isSuccess()) {
             action.setError(result.getMsg());
         }
-        service.insertUserAction(action);
 
         return result;
     }

java/local/src/main/java/cn/toesbieya/jxc/constant/MsgConstant.java

@@ -1,11 +1,7 @@
 package cn.toesbieya.jxc.constant;
 
 public interface MsgConstant {
-    Integer TYPE_NOTICE = 0;         //通知提醒
-    Integer TYPE_ANNOUNCEMENT = 1;   //系统公告
     Integer STATUS_DRAFT = 0;        //拟定
     Integer STATUS_PUBLISHED = 1;    //已发布
     Integer STATUS_WITHDREW = 2;     //已撤回
-    Integer TO_ALL = 1;              //发送给全体用户
-    Integer TO_RANGE = 0;            //已发送给指定用户
 }

java/local/src/main/java/cn/toesbieya/jxc/controller/msg/ManageController.java

@@ -92,8 +92,7 @@ public class ManageController {
     private String validateAdd(Msg msg) {
         if (StringUtils.isEmpty(msg.getTitle())
                 || msg.getType() == null
-                || msg.getBroadcast() == null
-                || msg.getBroadcast().equals(MsgConstant.TO_RANGE) && StringUtils.isEmpty(msg.getRecipient())
+                || !msg.isBroadcast() && StringUtils.isEmpty(msg.getRecipient())
         ) return "参数错误";
         return null;
     }

java/local/src/main/java/cn/toesbieya/jxc/controller/sys/CategoryController.java

@@ -51,7 +51,6 @@ public class CategoryController {
     private String validateCategoryCreateParam(SysCategory category) {
         if (category.getPid() == null) return "创建失败，参数错误";
         if (StringUtils.isEmpty(category.getName())) return "创建失败，分类名称不能为空";
-        if (category.getType() == null) return "创建失败，分类类型不能为空";
         return null;
     }
 
@@ -59,7 +58,6 @@ public class CategoryController {
         if (category.getId() == null) return "修改失败，参数错误";
         if (category.getPid() == null) return "创建失败，参数错误";
         if (StringUtils.isEmpty(category.getName())) return "创建失败，分类名称不能为空";
-        if (category.getType() == null) return "创建失败，分类类型不能为空";
         return null;
     }
 }

java/local/src/main/java/cn/toesbieya/jxc/controller/sys/CustomerController.java

@@ -55,7 +55,6 @@ public class CustomerController {
         if (StringUtils.isEmpty(customer.getAddress())) return "客户地址不能为空";
         if (StringUtils.isEmpty(customer.getLinkman())) return "客户联系人不能为空";
         if (StringUtils.isEmpty(customer.getLinkphone())) return "客户联系电话不能为空";
-        if (customer.getStatus() == null) return "客户状态不能为空";
         return null;
     }
 

java/local/src/main/java/cn/toesbieya/jxc/controller/sys/DepartmentController.java

@@ -1,10 +1,9 @@
 package cn.toesbieya.jxc.controller.sys;
 
-import cn.toesbieya.jxc.enumeration.GeneralStatusEnum;
 import cn.toesbieya.jxc.model.entity.SysDepartment;
 import cn.toesbieya.jxc.model.vo.DepartmentVo;
-import cn.toesbieya.jxc.service.sys.SysDepartmentService;
 import cn.toesbieya.jxc.model.vo.R;
+import cn.toesbieya.jxc.service.sys.SysDepartmentService;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
@@ -24,7 +23,7 @@ public class DepartmentController {
         if (!all) {
             list = list
                     .stream()
-                    .filter(i -> i.getStatus().equals(GeneralStatusEnum.ENABLED.getCode()))
+                    .filter(SysDepartment::isEnable)
                     .collect(Collectors.toList());
         }
         return R.success(list);
@@ -32,9 +31,7 @@ public class DepartmentController {
 
     @PostMapping("add")
     public R add(@RequestBody SysDepartment department) {
-        if (null == department.getPid()
-                || StringUtils.isEmpty(department.getName())
-                || null == department.getStatus()) {
+        if (null == department.getPid() || StringUtils.isEmpty(department.getName())) {
             return R.fail("添加失败，参数错误");
         }
         return service.add(department);
@@ -44,8 +41,7 @@ public class DepartmentController {
     public R update(@RequestBody SysDepartment department) {
         if (null == department.getId()
                 || null == department.getPid()
-                || StringUtils.isEmpty(department.getName())
-                || null == department.getStatus()) {
+                || StringUtils.isEmpty(department.getName())) {
             return R.fail("修改失败，参数错误");
         }
         return service.update(department);

java/local/src/main/java/cn/toesbieya/jxc/controller/sys/RoleController.java

@@ -29,8 +29,7 @@ public class RoleController {
 
     @PostMapping("add")
     public R add(@RequestBody SysRole role) {
-        if (StringUtils.isEmpty(role.getName())
-                || role.getStatus() == null) {
+        if (StringUtils.isEmpty(role.getName())) {
             return R.fail("添加失败，参数错误");
         }
 
@@ -45,9 +44,7 @@ public class RoleController {
 
     @PostMapping("update")
     public R update(@RequestBody SysRole role) {
-        if (StringUtils.isEmpty(role.getName())
-                || role.getId() == null
-                || role.getStatus() == null) {
+        if (StringUtils.isEmpty(role.getName()) || role.getId() == null) {
             return R.fail("修改失败，参数错误");
         }
         return service.update(role);

java/local/src/main/java/cn/toesbieya/jxc/controller/sys/SupplierController.java

@@ -53,7 +53,6 @@ public class SupplierController {
         if (StringUtils.isEmpty(supplier.getAddress())) return "供应商地址不能为空";
         if (StringUtils.isEmpty(supplier.getLinkman())) return "供应商联系人不能为空";
         if (StringUtils.isEmpty(supplier.getLinkphone())) return "供应商联系电话不能为空";
-        if (supplier.getStatus() == null) return "供应商状态不能为空";
         return null;
     }
 

java/local/src/main/java/cn/toesbieya/jxc/controller/sys/UserController.java

@@ -84,7 +84,6 @@ public class UserController {
         if (user.getId() == null) return "修改失败，参数错误";
         if (StringUtils.isEmpty(user.getName())) return "修改失败，用户名称不能为空";
         if (user.getRole() == null) return "修改失败，用户角色不能为空";
-        if (user.getStatus() == null) return "修改失败，用户状态不能为空";
         return null;
     }
 }

java/local/src/main/java/cn/toesbieya/jxc/model/entity/Msg.java

@@ -18,6 +18,6 @@ public class Msg {
     private String wname;
     private Long wtime;
     private Integer status;
-    private Integer broadcast;
+    private boolean broadcast = false;
     private String recipient;
 }

java/local/src/main/java/cn/toesbieya/jxc/model/entity/RecLoginHistory.java

@@ -15,6 +15,6 @@ public class RecLoginHistory {
     private String uname;
     private String ip;
     private String address;
-    private Integer type;
+    private boolean login = false;
     private Long time;
 }

java/local/src/main/java/cn/toesbieya/jxc/model/entity/RecUserAction.java

@@ -18,5 +18,5 @@ public class RecUserAction {
     private Long time;
     private String action;
     private String error;
-    private Integer type;
+    private boolean success = false;
 }

java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysCategory.java

@@ -7,6 +7,6 @@ public class SysCategory {
     private Integer id;
     private Integer pid;
     private String name;
-    private Integer type;
+    private boolean leaf = false;
     private Long ctime;
 }

java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysCustomer.java

@@ -16,7 +16,7 @@ public class SysCustomer {
     private String linkman;
     private String linkphone;
     private String region;
-    private Integer status;
+    private boolean enable = false;
     private Long ctime;
     private String remark;
 }

java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysDepartment.java

@@ -7,5 +7,5 @@ public class SysDepartment {
     private Integer id;
     private Integer pid;
     private String name;
-    private Integer status;
+    private boolean enable = false;
 }

java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysRole.java

@@ -10,7 +10,7 @@ public class SysRole {
     private Integer cid;
     private String cname;
     private Long ctime;
-    private Integer status;
+    private boolean enable = false;
     private int scope = DataScopeEnum.ALL.getCode();
     private String departmentId;
     private String resourceId;

java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysSupplier.java

@@ -10,7 +10,7 @@ public class SysSupplier {
     private String linkman;
     private String linkphone;
     private String region;
-    private Integer status;
+    private boolean enable = false;
     private Long ctime;
     private String remark;
 }

java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysUser.java

@@ -15,6 +15,6 @@ public class SysUser {
     private String avatar;
     private Long ctime;
     private boolean admin = false;
-    private Integer status;
+    private boolean enable = false;
     private Integer dept;
 }

java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/CategorySearch.java

@@ -9,7 +9,7 @@ public class CategorySearch {
     private Integer pid;
     private String pids;
     private String name;
-    private Integer type;
+    private Boolean leaf;
     private Long startTime;
     private Long endTime;
 }

java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/CustomerSearch.java

@@ -14,7 +14,7 @@ public class CustomerSearch extends BaseSearch {
     private String linkman;
     private String linkphone;
     private String region;
-    private Integer status;
+    private Boolean enable;
     private Long startTime;
     private Long endTime;
 }

java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/LoginHistorySearch.java

@@ -10,7 +10,7 @@ import lombok.ToString;
 public class LoginHistorySearch extends BaseSearch {
     private Integer uid;
     private String uname;
-    private Integer type;
+    private Boolean login;
     private String ip;
     private String address;
     private Long endTime;

java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/RoleSearch.java

@@ -12,7 +12,7 @@ public class RoleSearch extends BaseSearch {
     private String name;
     private Integer cid;
     private String cname;
-    private Integer status;
+    private Boolean enable;
     private Long startTime;
     private Long endTime;
 }

java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/SupplierSearch.java

@@ -14,7 +14,7 @@ public class SupplierSearch extends BaseSearch {
     private String linkman;
     private String linkphone;
     private String region;
-    private Integer status;
+    private Boolean enable;
     private Long startTime;
     private Long endTime;
 }

java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/UserActionSearch.java

@@ -14,5 +14,5 @@ public class UserActionSearch extends BaseSearch {
     private String url;
     private Long startTime;
     private Long endTime;
-    private String type;
+    private Boolean success;
 }

java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/UserSearch.java

@@ -13,5 +13,5 @@ public class UserSearch extends BaseSearch {
     private String role;
     private Long startTime;
     private Long endTime;
-    private Integer status;
+    private Boolean enable;
 }

java/local/src/main/java/cn/toesbieya/jxc/service/AccountService.java

@@ -2,8 +2,6 @@ package cn.toesbieya.jxc.service;
 
 import cn.toesbieya.jxc.annoation.TimeCost;
 import cn.toesbieya.jxc.annoation.UserAction;
-import cn.toesbieya.jxc.enumeration.GeneralStatusEnum;
-import cn.toesbieya.jxc.enumeration.RecLoginHistoryEnum;
 import cn.toesbieya.jxc.enumeration.ResourceTypeEnum;
 import cn.toesbieya.jxc.mapper.SysUserMapper;
 import cn.toesbieya.jxc.model.entity.RecLoginHistory;
@@ -50,7 +48,7 @@ public class AccountService {
         if (user == null) {
             return R.fail("用户名或密码错误");
         }
-        if (user.getStatus().equals(GeneralStatusEnum.DISABLED.getCode())) {
+        if (!user.isEnable()) {
             return R.fail("该用户已被禁用，请联系管理员");
         }
         Integer roleId = user.getRole();
@@ -131,7 +129,7 @@ public class AccountService {
                         .uid(user.getId())
                         .uname(user.getName())
                         .ip(ip)
-                        .type(RecLoginHistoryEnum.LOGIN.getCode())
+                        .login(true)
                         .time(now)
                         .build()
         );
@@ -147,7 +145,7 @@ public class AccountService {
                             .uid(user.getId())
                             .uname(user.getName())
                             .ip(ip)
-                            .type(RecLoginHistoryEnum.LOGOUT.getCode())
+                            .login(false)
                             .time(System.currentTimeMillis())
                             .build()
             );
@@ -169,7 +167,7 @@ public class AccountService {
         user.setPwd(param.getPassword());
         user.setRole(1);
         user.setDept(1);
-        user.setStatus(GeneralStatusEnum.ENABLED.getCode());
+        user.setEnable(true);
         user.setCtime(System.currentTimeMillis());
 
         userMapper.insert(user);

java/local/src/main/java/cn/toesbieya/jxc/service/RecService.java

@@ -39,7 +39,7 @@ public class RecService {
     public PageResult<RecLoginHistory> searchLoginHistory(LoginHistorySearch vo) {
         Integer uid = vo.getUid();
         String uname = vo.getUname();
-        Integer type = vo.getType();
+        Boolean login = vo.getLogin();
         String ip = vo.getIp();
         String address = vo.getAddress();
         Long startTime = vo.getStartTime();
@@ -49,7 +49,7 @@ public class RecService {
                 Wrappers.lambdaQuery(RecLoginHistory.class)
                         .eq(uid != null, RecLoginHistory::getUid, uid)
                         .like(!StringUtils.isEmpty(uname), RecLoginHistory::getUname, vo.getUname())
-                        .eq(type != null, RecLoginHistory::getType, type)
+                        .eq(login != null, RecLoginHistory::isLogin, login)
                         .eq(!StringUtils.isEmpty(ip), RecLoginHistory::getIp, vo.getIp())
                         .like(!StringUtils.isEmpty(address), RecLoginHistory::getAddress, vo.getAddress())
                         .ge(startTime != null, RecLoginHistory::getTime, startTime)
@@ -63,7 +63,7 @@ public class RecService {
     public PageResult<RecUserAction> searchUserAction(UserActionSearch vo) {
         Integer uid = vo.getUid();
         String uname = vo.getUname();
-        String type = vo.getType();
+        Boolean success = vo.getSuccess();
         String ip = vo.getIp();
         String url = vo.getUrl();
         Long startTime = vo.getStartTime();
@@ -73,7 +73,7 @@ public class RecService {
                 Wrappers.lambdaQuery(RecUserAction.class)
                         .eq(uid != null, RecUserAction::getUid, uid)
                         .like(!StringUtils.isEmpty(uname), RecUserAction::getUname, uname)
-                        .inSql(!StringUtils.isEmpty(type), RecUserAction::getType, type)
+                        .eq(success != null, RecUserAction::isSuccess, success)
                         .eq(!StringUtils.isEmpty(ip), RecUserAction::getIp, ip)
                         .eq(!StringUtils.isEmpty(url), RecUserAction::getUrl, url)
                         .ge(startTime != null, RecUserAction::getTime, startTime)

java/local/src/main/java/cn/toesbieya/jxc/service/msg/MsgService.java

@@ -65,7 +65,7 @@ public class MsgService {
                         .set(Msg::getWname, msg.getWname())
                         .set(Msg::getWtime, msg.getWtime())
                         .set(Msg::getStatus, msg.getStatus())
-                        .set(Msg::getBroadcast, msg.getBroadcast())
+                        .set(Msg::isBroadcast, msg.isBroadcast())
                         .set(Msg::getRecipient, msg.getRecipient())
                         .eq(Msg::getId, msg.getId())
         );
@@ -85,7 +85,7 @@ public class MsgService {
             eventVo.setEvent(SocketConstant.EVENT_NEW_MESSAGE);
 
             //发送websocket消息
-            if (msg.getBroadcast().equals(MsgConstant.TO_ALL)) {
+            if (msg.isBroadcast()) {
                 eventVo.setType(SocketConstant.REDIS_EVENT_BROADCAST);
                 WebSocketUtil.sendEvent(eventVo);
             }

java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysCategoryService.java

@@ -28,7 +28,7 @@ public class SysCategoryService {
         Integer pid = vo.getPid();
         String pids = vo.getPids();
         String name = vo.getName();
-        Integer type = vo.getType();
+        Boolean leaf = vo.getLeaf();
         Long startTime = vo.getStartTime();
         Long endTime = vo.getEndTime();
 
@@ -39,7 +39,7 @@ public class SysCategoryService {
                         .eq(pid != null, SysCategory::getPid, pid)
                         .inSql(!StringUtils.isEmpty(pids), SysCategory::getPid, pids)
                         .like(!StringUtils.isEmpty(name), SysCategory::getName, name)
-                        .eq(type != null, SysCategory::getType, type)
+                        .eq(leaf != null, SysCategory::isLeaf, leaf)
                         .ge(startTime != null, SysCategory::getCtime, startTime)
                         .le(endTime != null, SysCategory::getCtime, endTime)
                         .orderByDesc(SysCategory::getCtime)
@@ -67,7 +67,7 @@ public class SysCategoryService {
                 Wrappers.lambdaUpdate(SysCategory.class)
                         .set(SysCategory::getPid, category.getPid())
                         .set(SysCategory::getName, category.getName())
-                        .set(SysCategory::getType, category.getType())
+                        .set(SysCategory::isLeaf, category.isLeaf())
                         .eq(SysCategory::getId, category.getId())
         );
         return rows > 0 ? R.success("修改成功") : R.fail("修改失败，请刷新后重试");
@@ -91,7 +91,7 @@ public class SysCategoryService {
         //当该分类不是顶级节点时，判断其父节点是否允许有下级
         if (!category.getPid().equals(0)) {
             SysCategory parent = mapper.selectById(category.getPid());
-            if (parent == null || parent.getType().equals(1)) {
+            if (parent == null || parent.isLeaf()) {
                 return "父节点状态变更，请刷新后重试";
             }
         }
@@ -104,7 +104,7 @@ public class SysCategoryService {
         if (exist != null && exist > 0) {
             return String.format("分类【%s】已存在", category.getName());
         }
-        if (id != null && category.getType().equals(1) && hasChildren(id)) {
+        if (id != null && category.isLeaf() && hasChildren(id)) {
             return "该分类下存在子节点，不能改为实体类型";
         }
         return null;

java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysCustomerService.java

@@ -1,7 +1,6 @@
 package cn.toesbieya.jxc.service.sys;
 
 import cn.toesbieya.jxc.annoation.UserAction;
-import cn.toesbieya.jxc.enumeration.GeneralStatusEnum;
 import cn.toesbieya.jxc.mapper.SysCustomerMapper;
 import cn.toesbieya.jxc.mapper.SysRegionMapper;
 import cn.toesbieya.jxc.model.entity.SysCustomer;
@@ -39,7 +38,7 @@ public class SysCustomerService {
         String linkman = vo.getLinkman();
         String linkphone = vo.getLinkphone();
         String region = vo.getRegion();
-        Integer status = vo.getStatus();
+        Boolean enable = vo.getEnable();
         Long startTime = vo.getStartTime();
         Long endTime = vo.getEndTime();
 
@@ -51,7 +50,7 @@ public class SysCustomerService {
                         .like(!StringUtils.isEmpty(linkman), SysCustomer::getLinkman, linkman)
                         .eq(!StringUtils.isEmpty(linkphone), SysCustomer::getLinkphone, linkphone)
                         .inSql(!StringUtils.isEmpty(region), SysCustomer::getRegion, region)
-                        .eq(status != null, SysCustomer::getStatus, status)
+                        .eq(enable != null, SysCustomer::isEnable, enable)
                         .ge(startTime != null, SysCustomer::getCtime, startTime)
                         .le(endTime != null, SysCustomer::getCtime, endTime)
                         .orderByDesc(SysCustomer::getCtime);
@@ -112,7 +111,7 @@ public class SysCustomerService {
                         .set(SysCustomer::getLinkman, customer.getLinkman())
                         .set(SysCustomer::getLinkphone, customer.getLinkphone())
                         .set(SysCustomer::getRegion, customer.getRegion())
-                        .set(SysCustomer::getStatus, customer.getStatus())
+                        .set(SysCustomer::isEnable, customer.isEnable())
                         .set(SysCustomer::getRemark, customer.getRemark())
                         .eq(SysCustomer::getId, id)
         );
@@ -124,7 +123,7 @@ public class SysCustomerService {
         int rows = customerMapper.delete(
                 Wrappers.lambdaQuery(SysCustomer.class)
                         .eq(SysCustomer::getId, customer.getId())
-                        .eq(SysCustomer::getStatus, GeneralStatusEnum.DISABLED.getCode())
+                        .eq(SysCustomer::isEnable, false)
         );
         return rows > 0 ? R.success("删除成功") : R.fail("删除失败，请刷新重试");
     }

java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysRoleService.java

@@ -1,7 +1,6 @@
 package cn.toesbieya.jxc.service.sys;
 
 import cn.toesbieya.jxc.annoation.UserAction;
-import cn.toesbieya.jxc.enumeration.GeneralStatusEnum;
 import cn.toesbieya.jxc.mapper.SysRoleMapper;
 import cn.toesbieya.jxc.model.entity.SysRole;
 import cn.toesbieya.jxc.model.vo.R;
@@ -24,7 +23,7 @@ public class SysRoleService {
     public List<SysRole> get() {
         return mapper.selectList(
                 Wrappers.lambdaQuery(SysRole.class)
-                        .eq(SysRole::getStatus, GeneralStatusEnum.ENABLED.getCode())
+                        .eq(SysRole::isEnable, true)
         );
     }
 
@@ -37,7 +36,7 @@ public class SysRoleService {
         String name = vo.getName();
         Integer cid = vo.getCid();
         String cname = vo.getCname();
-        Integer status = vo.getStatus();
+        Boolean enable = vo.getEnable();
         Long startTime = vo.getStartTime();
         Long endTime = vo.getEndTime();
 
@@ -47,7 +46,7 @@ public class SysRoleService {
                         .like(!StringUtils.isEmpty(name), SysRole::getName, name)
                         .eq(cid != null, SysRole::getCid, cid)
                         .like(!StringUtils.isEmpty(cname), SysRole::getName, cname)
-                        .eq(status != null, SysRole::getStatus, status)
+                        .eq(enable != null, SysRole::isEnable, enable)
                         .ge(startTime != null, SysRole::getCtime, startTime)
                         .le(endTime != null, SysRole::getCtime, endTime)
                         .orderByDesc(SysRole::getCtime);
@@ -78,7 +77,7 @@ public class SysRoleService {
                 null,
                 Wrappers.lambdaUpdate(SysRole.class)
                         .set(SysRole::getName, name)
-                        .set(SysRole::getStatus, role.getStatus())
+                        .set(SysRole::isEnable, role.isEnable())
                         .set(SysRole::getScope, role.getScope())
                         .set(SysRole::getDepartmentId, role.getDepartmentId())
                         .set(SysRole::getResourceId, role.getResourceId())
@@ -92,7 +91,7 @@ public class SysRoleService {
         int rows = mapper.delete(
                 Wrappers.lambdaQuery(SysRole.class)
                         .eq(SysRole::getId, role.getId())
-                        .eq(SysRole::getStatus, GeneralStatusEnum.DISABLED.getCode())
+                        .eq(SysRole::isEnable, false)
         );
         return rows > 0 ? R.success("删除成功") : R.fail("删除失败，请刷新重试");
     }

java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysSupplierService.java

@@ -1,7 +1,6 @@
 package cn.toesbieya.jxc.service.sys;
 
 import cn.toesbieya.jxc.annoation.UserAction;
-import cn.toesbieya.jxc.enumeration.GeneralStatusEnum;
 import cn.toesbieya.jxc.mapper.SysRegionMapper;
 import cn.toesbieya.jxc.mapper.SysSupplierMapper;
 import cn.toesbieya.jxc.model.entity.SysRegion;
@@ -39,7 +38,7 @@ public class SysSupplierService {
         String linkman = vo.getLinkman();
         String linkphone = vo.getLinkphone();
         String region = vo.getRegion();
-        Integer status = vo.getStatus();
+        Boolean enable = vo.getEnable();
         Long startTime = vo.getStartTime();
         Long endTime = vo.getEndTime();
 
@@ -51,7 +50,7 @@ public class SysSupplierService {
                         .like(!StringUtils.isEmpty(linkman), SysSupplier::getLinkman, linkman)
                         .eq(!StringUtils.isEmpty(linkphone), SysSupplier::getLinkphone, linkphone)
                         .inSql(!StringUtils.isEmpty(region), SysSupplier::getRegion, region)
-                        .eq(status != null, SysSupplier::getStatus, status)
+                        .eq(enable != null, SysSupplier::isEnable, enable)
                         .ge(startTime != null, SysSupplier::getCtime, startTime)
                         .le(endTime != null, SysSupplier::getCtime, endTime)
                         .orderByDesc(SysSupplier::getCtime);
@@ -111,7 +110,7 @@ public class SysSupplierService {
                         .set(SysSupplier::getLinkman, supplier.getLinkman())
                         .set(SysSupplier::getLinkphone, supplier.getLinkphone())
                         .set(SysSupplier::getRegion, supplier.getRegion())
-                        .set(SysSupplier::getStatus, supplier.getStatus())
+                        .set(SysSupplier::isEnable, supplier.isEnable())
                         .set(SysSupplier::getRemark, supplier.getRemark())
                         .eq(SysSupplier::getId, id)
         );
@@ -123,7 +122,7 @@ public class SysSupplierService {
         int rows = supplierMapper.delete(
                 Wrappers.lambdaQuery(SysSupplier.class)
                         .eq(SysSupplier::getId, supplier.getId())
-                        .eq(SysSupplier::getStatus, GeneralStatusEnum.DISABLED.getCode())
+                        .eq(SysSupplier::isEnable, false)
         );
         return rows > 0 ? R.success("删除成功") : R.fail("删除失败，请刷新重试");
     }

java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysUserService.java

@@ -38,17 +38,17 @@ public class SysUserService {
         Integer id = vo.getId();
         String name = vo.getName();
         String roleIds = vo.getRole();
-        Integer status = vo.getStatus();
+        Boolean enable = vo.getEnable();
         Long startTime = vo.getStartTime();
         Long endTime = vo.getEndTime();
 
         Wrapper<SysUser> wrapper =
                 Wrappers.lambdaQuery(SysUser.class)
-                        .eq(SysUser::isAdmin, 0)
+                        .eq(SysUser::isAdmin, false)
                         .eq(id != null, SysUser::getId, id)
                         .like(!StringUtils.isEmpty(name), SysUser::getName, name)
                         .inSql(!StringUtils.isEmpty(roleIds), SysUser::getRole, roleIds)
-                        .eq(status != null, SysUser::getStatus, status)
+                        .eq(enable != null, SysUser::isEnable, enable)
                         .ge(startTime != null, SysUser::getCtime, startTime)
                         .le(endTime != null, SysUser::getCtime, endTime)
                         .orderByDesc(SysUser::getCtime);
@@ -136,7 +136,7 @@ public class SysUserService {
                         .set(SysUser::getName, name)
                         .set(SysUser::getRole, user.getRole())
                         .set(SysUser::getDept, user.getDept())
-                        .set(SysUser::getStatus, user.getStatus())
+                        .set(SysUser::isEnable, user.isEnable())
                         .eq(SysUser::getId, id)
         );
 
@@ -149,7 +149,7 @@ public class SysUserService {
         int rows = userMapper.delete(
                 Wrappers.lambdaQuery(SysUser.class)
                         .eq(SysUser::getId, user.getId())
-                        .eq(SysUser::isAdmin, 0)
+                        .eq(SysUser::isAdmin, false)
         );
         WebSocketUtil.sendLogoutEvent(Collections.singletonList(user.getId()), "该用户已删除");
         return rows > 0 ? R.success("删除成功") : R.fail("删除失败，请刷新后重试");

vue/src/view/message/manage/EditDialog.vue

@@ -18,11 +18,11 @@
             </abstract-form-item>
             <abstract-form-item label="通知对象" prop="broadcast" dense>
                 <el-select v-model="form.broadcast" :disabled="!canSave">
-                    <el-option :value="0" label="指定用户"/>
-                    <el-option :value="1" label="全体用户"/>
+                    <el-option :value="false" label="指定用户"/>
+                    <el-option :value="true" label="全体用户"/>
                 </el-select>
             </abstract-form-item>
-            <abstract-form-item v-if="form.broadcast===0" label="选择用户" prop="recipient" dense>
+            <abstract-form-item v-if="!form.broadcast" label="选择用户" prop="recipient" dense>
                 <user-selector v-model="form.recipient" :disabled="!canSave"/>
             </abstract-form-item>
             <abstract-form-item v-if="form.pname" label="发布人" dense>
@@ -93,7 +93,7 @@ export default {
                 wname: null,
                 wtime: null,
                 status: 0,
-                broadcast: 1,
+                broadcast: false,
                 recipient: []
             },
             rules: {
@@ -145,7 +145,6 @@ export default {
 
         clearForm() {
             resetObj(this.form)
-            this.form.broadcast = 1
             this.needSearch = false
             this.loading = false
             this.$nextTick(() => this.$refs.form.clearValidate())
@@ -226,8 +225,11 @@ export default {
         },
 
         transformForm() {
-            if (this.form.broadcast === 1) return this.form
-            else return {...this.form, recipient: this.form.recipient.join(',')}
+            const recipient =
+                Array.isArray(this.form.recipient) && this.form.recipient.length > 0
+                    ? this.form.recipient.join(',')
+                    : null
+            return {...this.form, recipient}
         }
     }
 }

vue/src/view/message/manage/indexPage.vue

@@ -35,7 +35,7 @@
                     <template v-slot="{row}">{{ row.type === 0 ? '通知提醒' : '系统公告' }}</template>
                 </el-table-column>
                 <el-table-column align="center" label="通知对象" show-overflow-tooltip>
-                    <template v-slot="{row}">{{ row.broadcast === 1 ? '全体用户' : '指定用户' }}</template>
+                    <template v-slot="{row}">{{ row.broadcast ? '全体用户' : '指定用户' }}</template>
                 </el-table-column>
                 <el-table-column align="center" label="状 态" show-overflow-tooltip>
                     <template v-slot="{row}">{{ transformStatus(row.status) }}</template>

vue/src/view/purchase/order/component/CategorySelector.vue

@@ -45,7 +45,7 @@ export default {
             return arr
         },
         selectableCategories() {
-            return this.$store.state.dataCache.categories.filter(i => i.type === 1)
+            return this.$store.state.dataCache.categories.filter(i => i.leaf)
         },
     },
 
@@ -58,7 +58,7 @@ export default {
 
         addDisabledAttr(arr) {
             arr.forEach(i => {
-                i._disabled = i.type !== 1
+                i._disabled = !i.leaf
                 i.children && this.addDisabledAttr(i.children)
             })
         },

vue/src/view/purchase/order/component/SupplierSelector.vue

@@ -47,8 +47,8 @@
                     </el-table-column>
                     <el-table-column align="center" label="状 态" width="120">
                         <template v-slot="{row}">
-                            <span :class="row.status===1?'success':'error'" class="dot"/>
-                            <span>{{ row.status === 1 ? '启用' : '禁用' }}</span>
+                            <span :class="row.enable ? 'success' : 'error'" class="dot"/>
+                            <span>{{ row.enable ? '启用' : '禁用' }}</span>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -79,7 +79,7 @@ export default {
     data() {
         return {
             searchForm: {
-                status: 1
+                enable: true
             }
         }
     },

vue/src/view/sell/order/component/CustomerSelector.vue

@@ -31,8 +31,8 @@
                     </el-table-column>
                     <el-table-column align="center" label="状 态" width="120">
                         <template v-slot="{row}">
-                            <span :class="row.status===1?'success':'error'" class="dot"/>
-                            <span>{{ row.status === 1 ? '启用' : '禁用' }}</span>
+                            <span :class="row.enable ?'success' : 'error'" class="dot"/>
+                            <span>{{ row.enable ? '启用' : '禁用' }}</span>
                         </template>
                     </el-table-column>
                 </abstract-table>
@@ -62,7 +62,7 @@ export default {
     data() {
         return {
             searchForm: {
-                status: 1
+                enable: true
             }
         }
     },

vue/src/view/system/category/component/Form.vue

@@ -7,10 +7,10 @@
             <el-form-item label="分类名称" prop="name">
                 <el-input v-model="form.name" :readonly="type === 'see'" maxlength="50"/>
             </el-form-item>
-            <el-form-item label="类 型" prop="type">
-                <el-select v-model="form.type" :disabled="type === 'see'">
-                    <el-option :value="0" label="分类"/>
-                    <el-option :value="1" label="实体"/>
+            <el-form-item label="类 型" prop="leaf">
+                <el-select v-model="form.leaf" :disabled="type === 'see'">
+                    <el-option :value="false" label="分类"/>
+                    <el-option :value="true" label="实体"/>
                 </el-select>
             </el-form-item>
             <el-form-item>
@@ -40,8 +40,8 @@ export default {
     props: ['list'],
 
     data() {
-        let typeValidate = (r, v, c) => {
-            if (v === 1 && this.hasChildren) c('该分类下已有子节点')
+        const typeValidate = (r, v, c) => {
+            if (v && this.hasChildren) c('该分类下已有子节点')
             c()
         }
         return {
@@ -52,13 +52,13 @@ export default {
                 id: null,
                 pid: 0,
                 name: '',
-                type: 0
+                leaf: false
             },
             parentObj: null,
             hasChildren: false,
             rules: {
                 name: [{required: true, message: '请输入分类名称', trigger: 'change'}],
-                type: [
+                leaf: [
                     {required: true, message: '请选择分类类型', trigger: 'change'},
                     {validator: typeValidate, trigger: 'change'}
                 ]
@@ -68,7 +68,9 @@ export default {
 
     computed: {
         show() {
-            return this.list() && (this.type === 'add' || ['see', 'edit'].includes(this.type) && this.list().currentCategory)
+            const ref = this.list()
+            if (!ref) return false
+            return this.type === 'add' || ['see', 'edit'].includes(this.type) && ref.currentCategory
         },
 
         confirmMessage() {
@@ -90,7 +92,7 @@ export default {
             this.type = 'add'
             this.form.pid = parent ? parent.id : 0
             this.form.name = ''
-            this.form.type = 0
+            this.form.leaf = false
             this.hasChildren = false
         },
 
@@ -131,7 +133,7 @@ export default {
             this.form.id = null
             this.form.pid = 0
             this.form.name = ''
-            this.form.type = 0
+            this.form.leaf = false
             this.parentObj = null
             this.hasChildren = false
         }

vue/src/view/system/category/component/List.vue

@@ -41,7 +41,7 @@ export default {
     computed: {
         canAdd() {
             return !this.currentCategory
-                || this.currentCategory.type === 0 && this.currentCategory.level < this.maxLevel
+                || !this.currentCategory.leaf && this.currentCategory.level < this.maxLevel
         }
     },
 

vue/src/view/system/category/indexPage.vue

@@ -2,10 +2,10 @@
     <div>
         <el-row :gutter="20">
             <el-col :span="8">
-                <category-list :form="()=>$refs.form||null" ref="list"/>
+                <category-list ref="list" :form="() => $refs.form || null"/>
             </el-col>
             <el-col :span="16">
-                <edit-form :list="()=>$refs.list||null" ref="form"/>
+                <edit-form ref="form" :list="() => $refs.list || null"/>
             </el-col>
         </el-row>
     </div>

vue/src/view/system/customer/EditDialog.vue

@@ -21,10 +21,10 @@
             <el-form-item label="联系电话" prop="linkphone">
                 <el-input v-model="form.linkphone" :readonly="!canEdit" maxlength="20"/>
             </el-form-item>
-            <el-form-item label="状 态" prop="status">
-                <el-radio-group v-model="form.status" :disabled="!canEdit">
-                    <el-radio :label="1">启用</el-radio>
-                    <el-radio :label="0">禁用</el-radio>
+            <el-form-item label="状 态" prop="enable">
+                <el-radio-group v-model="form.enable" :disabled="!canEdit">
+                    <el-radio :label="true">启用</el-radio>
+                    <el-radio :label="false">禁用</el-radio>
                 </el-radio-group>
             </el-form-item>
             <el-form-item label="备 注" prop="remark">
@@ -82,7 +82,7 @@ export default {
                 linkphone: null,
                 region: null,
                 regionName: null,
-                status: 1,
+                enable: false,
                 remark: null
             },
             rules: {
@@ -90,7 +90,6 @@ export default {
                 address: [{required: true, message: '地址不能为空', trigger: 'change'}],
                 linkman: [{required: true, message: '联系人不能为空', trigger: 'change'}],
                 linkphone: [{required: true, message: '联系电话不能为空', trigger: 'change'}],
-                status: [{required: true, message: '状态不能为空', trigger: 'change'}],
                 regionName: [{required: true, message: '行政区域不能为空', trigger: 'change'}],
             }
         }
@@ -142,7 +141,6 @@ export default {
 
         clearForm() {
             resetObj(this.form)
-            this.form.status = 1
             this.$nextTick(() => this.$refs.form.clearValidate())
         },
 

vue/src/view/system/customer/indexPage.vue

@@ -24,9 +24,9 @@
                 <el-input v-model="searchForm.linkphone" clearable maxlength="20"/>
             </search-form-item>
             <search-form-item label="状 态">
-                <el-select v-model="searchForm.status" clearable @clear="searchForm.status=null">
-                    <el-option :value="1" label="启用"/>
-                    <el-option :value="0" label="禁用"/>
+                <el-select v-model="searchForm.enable" clearable @clear="searchForm.enable = null">
+                    <el-option :value="true" label="启用"/>
+                    <el-option :value="false" label="禁用"/>
                 </el-select>
             </search-form-item>
             <search-form-item label="创建时间">
@@ -60,8 +60,8 @@
                 </el-table-column>
                 <el-table-column align="center" label="状 态" width="120">
                     <template v-slot="{row}">
-                        <span :class="row.status===1?'success':'error'" class="dot"/>
-                        <span>{{ row.status === 1 ? '启用' : '禁用' }}</span>
+                        <span :class="row.enable ? 'success' : 'error'" class="dot"/>
+                        <span>{{ row.enable ? '启用' : '禁用' }}</span>
                     </template>
                 </el-table-column>
             </abstract-table>
@@ -99,7 +99,7 @@ export default {
                 linkman: '',
                 linkphone: '',
                 region: null,
-                status: null
+                enable: null
             },
             temp: {
                 regionName: null,

vue/src/view/system/department/component/EditDialog.vue

@@ -7,10 +7,10 @@
             <el-form-item label="部门名称" prop="name">
                 <el-input v-model="form.name" maxlength="20"/>
             </el-form-item>
-            <el-form-item label="部门状态" prop="status">
-                <el-radio-group v-model="form.status">
-                    <el-radio :label="1">启用</el-radio>
-                    <el-radio :label="0">禁用</el-radio>
+            <el-form-item label="部门状态" prop="enable">
+                <el-radio-group v-model="form.enable">
+                    <el-radio :label="true">启用</el-radio>
+                    <el-radio :label="false">禁用</el-radio>
                 </el-radio-group>
             </el-form-item>
         </abstract-form>
@@ -50,11 +50,10 @@ export default {
                 id: null,
                 pid: null,
                 name: null,
-                status: 1,
+                enable: false,
             },
             rules: {
-                name: [{required: true, message: '部门名称不能为空', trigger: 'change'}],
-                status: [{required: true, message: '部门状态不能为空', trigger: 'change'}]
+                name: [{required: true, message: '部门名称不能为空', trigger: 'change'}]
             }
         }
     },
@@ -105,7 +104,7 @@ export default {
             this.form.id = null
             this.form.pid = null
             this.form.name = null
-            this.form.status = 1
+            this.form.enable = false
             this.$nextTick(() => this.$refs.form.clearValidate())
         },
 

vue/src/view/system/role/EditDialog.vue

@@ -4,10 +4,10 @@
             <el-form-item label="名 称" prop="name">
                 <el-input v-model="form.name" maxlength="20"/>
             </el-form-item>
-            <el-form-item label="状 态" prop="status">
-                <el-radio-group v-model="form.status">
-                    <el-radio :label="1">启用</el-radio>
-                    <el-radio :label="0">禁用</el-radio>
+            <el-form-item label="状 态" prop="enable">
+                <el-radio-group v-model="form.enable">
+                    <el-radio :label="true">启用</el-radio>
+                    <el-radio :label="false">禁用</el-radio>
                 </el-radio-group>
             </el-form-item>
             <el-form-item label="数据范围" prop="scope">
@@ -90,14 +90,13 @@ export default {
             form: {
                 id: null,
                 name: null,
-                status: 1,
+                enable: false,
                 scope: 1,
                 departmentId: [],
                 resourceId: []
             },
             rules: {
                 name: [{required: true, message: '角色名称不能为空', trigger: 'change'}],
-                status: [{required: true, message: '角色状态不能为空', trigger: 'change'}],
                 scope: [{required: true, message: '数据范围不能为空', trigger: 'change'}],
             },
             departments: []
@@ -148,7 +147,7 @@ export default {
         clearForm() {
             this.form.id = null
             this.form.name = null
-            this.form.status = 1
+            this.form.enable = false
             this.form.scope = 1
             this.form.departmentId = []
             this.form.resourceId = []

vue/src/view/system/role/indexPage.vue

@@ -8,9 +8,9 @@
                 <el-input v-model="searchForm.cname" clearable maxlength="100"/>
             </search-form-item>
             <search-form-item label="状 态">
-                <el-select v-model="searchForm.status" clearable @clear="searchForm.status=null">
-                    <el-option :value="1" label="启用"/>
-                    <el-option :value="0" label="禁用"/>
+                <el-select v-model="searchForm.enable" clearable @clear="searchForm.enable = null">
+                    <el-option :value="true" label="启用"/>
+                    <el-option :value="false" label="禁用"/>
                 </el-select>
             </search-form-item>
             <search-form-item label="创建时间">
@@ -41,8 +41,8 @@
                 </el-table-column>
                 <el-table-column align="center" label="状 态" width="120">
                     <template v-slot="{row}">
-                        <span :class="row.status===1?'success':'error'" class="dot"/>
-                        <span>{{ row.status === 1 ? '启用' : '禁用' }}</span>
+                        <span :class="row.enable ? 'success' : 'error'" class="dot"/>
+                        <span>{{ row.enable ? '启用' : '禁用' }}</span>
                     </template>
                 </el-table-column>
             </abstract-table>
@@ -76,7 +76,7 @@ export default {
             searchForm: {
                 name: '',
                 cname: '',
-                status: null
+                enable: null
             },
             temp: {
                 ctime: []
@@ -142,8 +142,8 @@ export default {
 
         del() {
             if (!this.row) return elError('请选择要删除的角色')
-            const {id, name, status} = this.row
-            if (status === 1) return elError('不能删除已启用的角色')
+            const {id, name, enable} = this.row
+            if (enable) return elError('不能删除已启用的角色')
             if (this.config.operating) return
             elConfirm(`确定删除角色【${name}】？`)
                 .then(() => {

vue/src/view/system/supplier/EditDialog.vue

@@ -21,10 +21,10 @@
             <el-form-item label="联系电话" prop="linkphone">
                 <el-input v-model="form.linkphone" :readonly="!canEdit" maxlength="20"/>
             </el-form-item>
-            <el-form-item label="状 态" prop="status">
-                <el-radio-group v-model="form.status" :disabled="!canEdit">
-                    <el-radio :label="1">启用</el-radio>
-                    <el-radio :label="0">禁用</el-radio>
+            <el-form-item label="状 态" prop="enable">
+                <el-radio-group v-model="form.enable" :disabled="!canEdit">
+                    <el-radio :label="true">启用</el-radio>
+                    <el-radio :label="false">禁用</el-radio>
                 </el-radio-group>
             </el-form-item>
             <el-form-item label="备 注" prop="remark">
@@ -82,7 +82,7 @@ export default {
                 linkphone: null,
                 region: null,
                 regionName: null,
-                status: 1,
+                enable: false,
                 remark: null
             },
             rules: {
@@ -90,7 +90,6 @@ export default {
                 address: [{required: true, message: '地址不能为空', trigger: 'change'}],
                 linkman: [{required: true, message: '联系人不能为空', trigger: 'change'}],
                 linkphone: [{required: true, message: '联系电话不能为空', trigger: 'change'}],
-                status: [{required: true, message: '状态不能为空', trigger: 'change'}],
                 regionName: [{required: true, message: '行政区域不能为空', trigger: 'change'}],
             }
         }
@@ -142,7 +141,6 @@ export default {
 
         clearForm() {
             resetObj(this.form)
-            this.form.status = 1
             this.$nextTick(() => this.$refs.form.clearValidate())
         },
 

vue/src/view/system/supplier/indexPage.vue

@@ -24,9 +24,9 @@
                 <el-input v-model="searchForm.linkphone" clearable maxlength="20"/>
             </search-form-item>
             <search-form-item label="状 态">
-                <el-select v-model="searchForm.status" clearable @clear="searchForm.status=null">
-                    <el-option :value="1" label="启用"/>
-                    <el-option :value="0" label="禁用"/>
+                <el-select v-model="searchForm.enable" clearable @clear="searchForm.enable = null">
+                    <el-option :value="true" label="启用"/>
+                    <el-option :value="false" label="禁用"/>
                 </el-select>
             </search-form-item>
             <search-form-item label="创建时间">
@@ -60,8 +60,8 @@
                 </el-table-column>
                 <el-table-column align="center" label="状 态" width="120">
                     <template v-slot="{row}">
-                        <span :class="row.status===1?'success':'error'" class="dot"/>
-                        <span>{{ row.status === 1 ? '启用' : '禁用' }}</span>
+                        <span :class="row.enable ? 'success' : 'error'" class="dot"/>
+                        <span>{{ row.enable ? '启用' : '禁用' }}</span>
                     </template>
                 </el-table-column>
             </abstract-table>
@@ -99,7 +99,7 @@ export default {
                 linkman: '',
                 linkphone: '',
                 region: null,
-                status: null
+                enable: null
             },
             temp: {
                 regionName: null,

vue/src/view/system/user/component/DepartmentSelector.vue

@@ -6,7 +6,6 @@
 import TreeSelect from '@/component/TreeSelect'
 import {getDepartments} from "@/api/system/department"
 import {createTreeByWorker} from "@/util/tree"
-import {isEmpty} from "@/util"
 
 export default {
     name: "DepartmentSelector",

vue/src/view/system/user/component/EditDialog.vue

@@ -20,10 +20,10 @@
                 />
                 <template v-else>{{ form.deptName }}</template>
             </el-form-item>
-            <el-form-item label="状 态" prop="status">
-                <el-radio-group v-model="form.status" :disabled="!canEdit">
-                    <el-radio :label="1">启用</el-radio>
-                    <el-radio :label="0">禁用</el-radio>
+            <el-form-item label="状 态" prop="enable">
+                <el-radio-group v-model="form.enable" :disabled="!canEdit">
+                    <el-radio :label="true">启用</el-radio>
+                    <el-radio :label="false">禁用</el-radio>
                 </el-radio-group>
             </el-form-item>
         </abstract-form>
@@ -74,7 +74,7 @@ export default {
                 roleName: null,
                 dept: null,
                 deptName: null,
-                status: 1,
+                enable: false
             },
             rules: {
                 name: [
@@ -82,8 +82,7 @@ export default {
                     {validator: validateName, trigger: 'change'}
                 ],
                 role: [{required: true, message: '用户角色不能为空', trigger: 'change'}],
-                dept: [{required: true, message: '用户部门不能为空', trigger: 'change'}],
-                status: [{required: true, message: '用户状态不能为空', trigger: 'change'}],
+                dept: [{required: true, message: '用户部门不能为空', trigger: 'change'}]
             }
         }
     },
@@ -135,7 +134,7 @@ export default {
             this.form.roleName = null
             this.form.dept = null
             this.form.deptName = null
-            this.form.status = 1
+            this.form.enable = false
             this.$nextTick(() => this.$refs.form.clearValidate())
         },
 

vue/src/view/system/user/indexPage.vue

@@ -8,9 +8,9 @@
                 <role-selector v-model="searchForm.role"/>
             </search-form-item>
             <search-form-item label="状 态">
-                <el-select v-model="searchForm.status" clearable @clear="searchForm.status = null">
-                    <el-option :value="1" label="启用"/>
-                    <el-option :value="0" label="禁用"/>
+                <el-select v-model="searchForm.enable" clearable @clear="searchForm.enable = null">
+                    <el-option :value="true" label="启用"/>
+                    <el-option :value="false" label="禁用"/>
                 </el-select>
             </search-form-item>
             <search-form-item label="创建时间">
@@ -65,8 +65,8 @@
                 </el-table-column>
                 <el-table-column align="center" label="状 态" width="120">
                     <template v-slot="{row}">
-                        <span :class="row.status === 1 ? 'success' : 'error'" class="dot"/>
-                        <span>{{ row.status === 1 ? '启用' : '禁用' }}</span>
+                        <span :class="row.enable ? 'success' : 'error'" class="dot"/>
+                        <span>{{ row.enable ? '启用' : '禁用' }}</span>
                     </template>
                 </el-table-column>
             </abstract-table>
@@ -102,7 +102,7 @@ export default {
             searchForm: {
                 name: '',
                 role: null,
-                status: null
+                enable: null
             },
             temp: {ctime: []},
             editDialog: false

vue/src/view/userCenter/component/LoginHistory.vue

@@ -11,8 +11,8 @@
             </el-table-column>
             <el-table-column align="center" label="说明" width="80">
                 <template v-slot="{row}">
-                    <el-tag :type="row.type===1?'success':'danger'" size="small" effect="dark">
-                        {{ getInfo(row.type) }}
+                    <el-tag :type="row.login ? 'success' : 'danger'" size="small" effect="dark">
+                        {{ row.login ? '登录' : '登出' }}
                     </el-tag>
                 </template>
             </el-table-column>
@@ -55,16 +55,6 @@ export default {
                     this.tableData = list
                 })
                 .finally(() => this.config.loading = false)
-        },
-
-        getInfo(type) {
-            switch (type) {
-                case 0:
-                    return '登出'
-                case 1:
-                    return '登陆'
-            }
-            return null
         }
     }
 }

vue/src/view/userCenter/component/UserAction.vue

@@ -11,14 +11,14 @@
             </el-table-column>
             <el-table-column align="center" label="状态" width="80">
                 <template v-slot="{row}">
-                    <el-tooltip :disabled="row.type!==0" placement="left">
+                    <el-tooltip :disabled="row.success" placement="left">
                         <div slot="content" style="max-width: 60vw">
                             <el-scrollbar wrap-class="el-select-dropdown__wrap">
                                 <p>{{ row.error }}</p>
                             </el-scrollbar>
                         </div>
-                        <el-tag :type="row.type===1?'success':'danger'" size="small" effect="dark">
-                            {{ getInfo(row.type) }}
+                        <el-tag :type="row.success ? 'success' : 'danger'" size="small" effect="dark">
+                            {{ row.success ? '成功' : '失败' }}
                         </el-tag>
                     </el-tooltip>
                 </template>
@@ -46,32 +46,16 @@ export default {
         }
     },
 
-    computed: {
-        uid() {
-            return this.$store.state.user.id
-        }
-    },
-
     methods: {
         search() {
             if (this.config.loading) return
             this.config.loading = true
-            searchUserAction({...this.searchForm, uid: this.uid})
+            searchUserAction({...this.searchForm, uid: this.$store.state.user.id})
                 .then(({list, total}) => {
                     this.searchForm.total = total
                     this.tableData = list
                 })
                 .finally(() => this.config.loading = false)
-        },
-
-        getInfo(type) {
-            switch (type) {
-                case 0:
-                    return '失败'
-                case 1:
-                    return '成功'
-            }
-            return null
         }
     }
 }