angelo
/
java-zk-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
sangelxiu1 2025-10-27 14:26:30 +08:00
parent 89b739503c 8c207bc75e
commit eb2f93b898
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java
View File

@ -464,7 +464,9 @@ public class EnumsController extends BaseController {
public AjaxResult specialAreaConsume() { public AjaxResult specialAreaConsume() {
List<EnumEntity> enumEntityList = new ArrayList<>(); List<EnumEntity> enumEntityList = new ArrayList<>();
for (ESpecialArea value : ESpecialArea.values()) { for (ESpecialArea value : ESpecialArea.values()) {
enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); if (value.getEnable() == EnableStatus.ENABLE.getValue()) {
enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel()));
}
} }
return AjaxResult.success(enumEntityList); return AjaxResult.success(enumEntityList);
} }
@ -561,7 +563,7 @@ public class EnumsController extends BaseController {
public AjaxResult account() { public AjaxResult account() {
List<EnumEntity> enumEntityList = new ArrayList<>(); List<EnumEntity> enumEntityList = new ArrayList<>();
for (EAccount value : EAccount.values()) { for (EAccount value : EAccount.values()) {
enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.ACCOUNT)); enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel()));
} }
return AjaxResult.success(enumEntityList); return AjaxResult.success(enumEntityList);
} }