From e776dcaa5aa2416634644c2c7ac333ee95738b95 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 17 三月 2025 15:57:31 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-after
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderTemplateServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderTemplateServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderTemplateServiceImpl.java
index 0f1fc4a..e51f1d7 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderTemplateServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderTemplateServiceImpl.java
@@ -1,5 +1,6 @@
package com.yuanchu.mom.service.impl;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
@@ -27,12 +28,13 @@
@Override
public int addInsOrderTemplate(InsOrderTemplate insOrderTemplate) {
+ insOrderTemplateMapper.delete(Wrappers.<InsOrderTemplate>lambdaQuery().eq(InsOrderTemplate::getName,insOrderTemplate.getName()));
return insOrderTemplateMapper.insert(insOrderTemplate);
}
@Override
public List<InsOrderTemplate> selectInsOrderTemplate(String company) {
- if (company == null) {
+ if (ObjectUtils.isEmpty(company) || company.equals("")) {
return insOrderTemplateMapper.selectList(Wrappers.<InsOrderTemplate>lambdaQuery()
.select(InsOrderTemplate.class, info -> !info.getColumn().equals("thing")));
} else {
--
Gitblit v1.9.3