diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/PrintMachineController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/PrintMachineController.java index 08d6202bb..af3f3a8a1 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/PrintMachineController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/PrintMachineController.java @@ -1,6 +1,7 @@ package com.czg.controller.admin; import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson2.JSONArray; import com.czg.account.dto.print.PrinterAddDTO; import com.czg.account.dto.print.PrinterDelDTO; import com.czg.account.dto.print.PrinterEditDTO; @@ -50,7 +51,13 @@ public class PrintMachineController { queryWrapper.eq(PrintMachine::getSubType, subType); } queryWrapper.orderBy(PrintMachine::getSort, true).orderBy(PrintMachine::getId, false); - return CzgResult.success(printMachineService.page(PageUtil.buildPage(), queryWrapper)); + Page page = printMachineService.page(PageUtil.buildPage(), queryWrapper); + page.getRecords().forEach(item -> { + if (StrUtil.isNotBlank(item.getCategoryIds())) { + item.setCategoryList(JSONArray.parse(item.getCategoryIds())); + } + }); + return CzgResult.success(page); } /** @@ -61,7 +68,11 @@ public class PrintMachineController { @SaAdminCheckPermission(value = "printer:detail", name = "打印机详情获取") @GetMapping("/detail") public CzgResult detail(@RequestParam Integer id) { - return CzgResult.success(printMachineService.getOne(new QueryWrapper().eq(PrintMachine::getId, id).eq(PrintMachine::getShopId, StpKit.USER.getShopId()))); + PrintMachine printMachine = printMachineService.getOne(new QueryWrapper().eq(PrintMachine::getId, id).eq(PrintMachine::getShopId, StpKit.USER.getShopId())); + if (printMachine != null && StrUtil.isNotBlank(printMachine.getCategoryIds())) { + printMachine.setCategoryList(JSONArray.parse(printMachine.getCategoryIds())); + } + return CzgResult.success(printMachine); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PrintMachine.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PrintMachine.java index 358833469..6a4e3f5bf 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PrintMachine.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PrintMachine.java @@ -8,6 +8,7 @@ import java.io.Serializable; import java.time.LocalDateTime; import java.io.Serial; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Builder; @@ -87,7 +88,7 @@ public class PrintMachine implements Serializable { /** * 分类 */ - private String categoryList; + private List categoryList; /** * 排序