diff --git a/hsweb-commons/hsweb-commons-controller/src/main/java/org/hswebframework/web/controller/SimpleGenericEntityController.java b/hsweb-commons/hsweb-commons-controller/src/main/java/org/hswebframework/web/controller/SimpleGenericEntityController.java index 424452c69..809f93863 100644 --- a/hsweb-commons/hsweb-commons-controller/src/main/java/org/hswebframework/web/controller/SimpleGenericEntityController.java +++ b/hsweb-commons/hsweb-commons-controller/src/main/java/org/hswebframework/web/controller/SimpleGenericEntityController.java @@ -18,19 +18,9 @@ package org.hswebframework.web.controller; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; -import org.hswebframework.web.authorization.Permission; -import org.hswebframework.web.authorization.annotation.Authorize; import org.hswebframework.web.commons.entity.Entity; import org.hswebframework.web.commons.entity.GenericEntity; -import org.hswebframework.web.controller.message.ResponseMessage; -import org.hswebframework.web.logging.AccessLogger; import org.hswebframework.web.service.CrudService; -import org.springframework.web.bind.annotation.PatchMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; /** * 通用实体的增删改查控制器 diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/hsweb-system-authorization-service-simple/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/hsweb-system-authorization-service-simple/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java index fdc8e4f5b..5856a4827 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/hsweb-system-authorization-service-simple/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/hsweb-system-authorization-service-simple/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java @@ -248,7 +248,7 @@ public class SimpleAuthorizationSettingService extends GenericEntityService detailList = DefaultDSLQueryService .createQuery(authorizationSettingDetailDao) - .where(AuthorizationSettingDetailEntity.state, STATE_OK) + .where(AuthorizationSettingDetailEntity.status, STATE_OK) .and().in(AuthorizationSettingDetailEntity.settingId, settingIdList) .list(); //权限 diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/hsweb-system-authorization-service-simple/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleMenuGroupService.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/hsweb-system-authorization-service-simple/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleMenuGroupService.java index 9e2cbddd5..2ec9898c3 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/hsweb-system-authorization-service-simple/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleMenuGroupService.java +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/hsweb-system-authorization-service-simple/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleMenuGroupService.java @@ -132,7 +132,7 @@ public class SimpleMenuGroupService public void enable(String id) { tryValidateProperty(StringUtils.hasLength(id), MenuGroupEntity.id, "{id_is_null}"); createUpdate() - .set(MenuGroupEntity.state, 1) + .set(MenuGroupEntity.status, 1) .where(MenuGroupEntity.id, id) .exec(); } @@ -143,7 +143,7 @@ public class SimpleMenuGroupService tryValidateProperty(StringUtils.hasLength(id), MenuGroupEntity.id, "{id_is_null}"); DefaultDSLUpdateService .createUpdate(getDao()) - .set(MenuGroupEntity.state, 0) + .set(MenuGroupEntity.status, 0) .where(MenuGroupEntity.id, id) .exec(); }