From f38e508d334ae03024f0dce0d1fb6baed212dc24 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 26 九月 2019 15:52:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java
index 513f76e..134fb96 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java
@@ -71,9 +71,13 @@
@Override
public void saveObject(MultipartFile file, BrandInfo record) throws BrandInfoException {
String name = record.getName();
- if (name == null || name.trim().length() == 0)
+ if (StringUtil.isNullOrEmpty(name))
throw new BrandInfoException(1, "鍚嶇О涓嶈兘涓虹┖");
+ String searchKey = record.getSearchKey();
+ if (StringUtil.isNullOrEmpty(searchKey))
+ record.setSearchKey(name);
+
Integer state = record.getState();
if (state == null)
record.setState(0);
@@ -212,8 +216,9 @@
return;
for (BrandInfo brandInfo : list) {
- String key = brandInfo.getName();
- if (StringUtil.isNullOrEmpty(key))
+ String name = brandInfo.getName();
+ String searchKey = brandInfo.getSearchKey();
+ if (StringUtil.isNullOrEmpty(name) && StringUtil.isNullOrEmpty(searchKey))
continue;
// 娣诲姞鍟嗗搧
--
Gitblit v1.8.0