From 9de1d40d3a61ce166c63a2c07d02d89bf8bdabd0 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 07 三月 2025 16:16:18 +0800
Subject: [PATCH] art: 选择设备查询逻辑修改， 点检工单新增时产线逻辑修改
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java
index 1ee528d..7d2a24c 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java
@@ -8,11 +8,12 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.mdc.dto.MdcBigScreenEquipmentDto;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcWorkshopEquipment;
@@ -229,7 +230,8 @@
try {
String workshopId = mdcWorkshopEquipmentVo.getWorkshopId();
for (String equipmentId : mdcWorkshopEquipmentVo.getEquipmentIdList()) {
- if (!StringUtils.isEmpty(equipmentId) && !"null".equals(equipmentId)) {
+ List<MdcEquipment> list = mdcEquipmentService.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentId, equipmentId));
+ if (list != null && !list.isEmpty()) {
MdcWorkshopEquipment mdcWorkshopEquipment = new MdcWorkshopEquipment();
mdcWorkshopEquipment.setWorkshopId(workshopId);
mdcWorkshopEquipment.setEquipmentId(equipmentId);
@@ -258,7 +260,9 @@
@ApiOperation(value = "澶у睆杞﹂棿淇℃伅-棣栭〉鑾峰彇澶у睆鍏ュ彛鍒楄〃", notes = "澶у睆杞﹂棿淇℃伅-棣栭〉鑾峰彇澶у睆鍏ュ彛鍒楄〃")
@GetMapping(value = "/getWorkshopList")
public Result<List<MdcWorkshopInfo>> getWorkshopList() {
- List<MdcWorkshopInfo> list = mdcWorkshopInfoService.list();
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ List<MdcWorkshopInfo> list = mdcWorkshopInfoService.listByUser(userId);
return Result.OK(list);
}
--
Gitblit v1.9.3