修改账号是否可用字段

gis_admin/src/main/java/com/gis/admin/controller/LoginController.java

@@ -107,7 +107,7 @@ public class LoginController {
         }
 
         // 检查账号是否启用
-        if (entity.getIsDisable() != 0) {
+        if (entity.getIsEnabled() != 1) {
             log.error("此账号已停用： {}", entity.getUserName());
             return Result.failure("此账号已停用");
         }

gis_admin/src/main/java/com/gis/admin/controller/SysUserController.java

@@ -81,10 +81,10 @@ public class SysUserController {
 
     @RequiresRoles(value = {"sys_admin"}, logical = Logical.OR)
     @WebControllerLog(description = "用户管理-启用、停用账户")
-    @ApiOperation(value = "启用、停用账户", notes = "isDisable-> 0:可用， 1：禁用")
-    @GetMapping("editStatus/{id}/{isDisable}")
-    public Result editStatus(@PathVariable Long id, @PathVariable Integer isDisable) {
-        return userService.editStatus(id, isDisable);
+    @ApiOperation(value = "启用、停用账户", notes = "isEnabled-> 1:可用， 0：禁用")
+    @GetMapping("editStatus/{id}/{isEnabled}")
+    public Result editStatus(@PathVariable Long id, @PathVariable Integer isEnabled) {
+        return userService.editStatus(id, isEnabled);
 
     }
 

gis_admin/src/main/java/com/gis/admin/entity/po/SysUserEntity.java

@@ -47,8 +47,8 @@ public class SysUserEntity extends BaseEntity implements Serializable {
 //    @ApiModelProperty(value = "超级管理员，1：是， 0：否")
 //    private Integer sysManager;
 
-    @ApiModelProperty(value = "状态 0:启用(默认值)  1：禁用")
-    private Integer isDisable;
+    @ApiModelProperty(value = "是否启动 0: 禁用  1：启用(默认值)")
+    private Integer isEnabled;
 
 //    @ApiModelProperty(value = "高清图url")
 //    private String img;

gis_admin/src/main/java/com/gis/admin/service/SysUserService.java

@@ -28,7 +28,7 @@ public interface SysUserService extends IBaseService<SysUserEntity, Long> {
 
     Result resetPass(Long id);
 
-    Result editStatus(Long id, Integer isDisable);
+    Result editStatus(Long id, Integer isEnabled);
 
     Result register(RegisterDto param);
 

gis_admin/src/main/java/com/gis/admin/service/impl/SysUserServiceImpl.java

@@ -179,7 +179,7 @@ public class SysUserServiceImpl extends IBaseServiceImpl<SysUserEntity, Long> im
     }
 
     @Override
-    public Result editStatus(Long id, Integer isDisable) {
+    public Result editStatus(Long id, Integer isEnabled) {
 
         SysUserEntity user = this.findById(id);
         if (user == null) {
@@ -192,7 +192,7 @@ public class SysUserServiceImpl extends IBaseServiceImpl<SysUserEntity, Long> im
             return Result.failure("管理员账户不能停用/注销");
         }
 
-        user.setIsDisable(isDisable);
+        user.setIsEnabled(isEnabled);
         user.setUpdateTime(LocalDateTime.now());
         this.update(user);
         return Result.success();
@@ -215,7 +215,7 @@ public class SysUserServiceImpl extends IBaseServiceImpl<SysUserEntity, Long> im
         BeanUtils.copyProperties(param, entity);
 
         entity.setPassword(PasswordUtils.encrypt(param.getUserName(), param.getPassword(), PasswordUtils.getStaticSalt()));
-        entity.setIsDisable(0);
+        entity.setIsEnabled(1);
         this.save(entity);
 
         // 设置默认角色, 2:sys_visitor游客角色