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

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java

@@ -197,20 +197,28 @@ public class StoreApiServiceImpl implements StoreApiService {
             sb.append("门店名称").append("【").append(oldStore.getStoreName()).append("】")
                     .append("变更为【").append(newStore.getStoreName()).append("】");
         }
-        if (!CollectionUtils.isEqualCollection(oldStore.getPhotoList(), newStore.getPhotoList())) {
-            sb.append("门店照片变更");
+        if (CollectionUtils.isNotEmpty(oldStore.getPhotoList()) && CollectionUtils.isNotEmpty(newStore.getPhotoList())) {
+            if (!CollectionUtils.isEqualCollection(oldStore.getPhotoList(), newStore.getPhotoList())) {
+                sb.append("门店照片变更");
+            }
         }
         if (newStore.getStoreType() != null && !newStore.getStoreType().equals(oldStore.getStoreType())) {
-            ServiceResponse<StoreDictDTO> oldStoreType = this.storeDictApiService.getStoreDict("storeType", oldStore.getStoreType().toString());
+            sb.append("门店类型");
+            if (oldStore.getStoreType() != null) {
+                ServiceResponse<StoreDictDTO> oldStoreType = this.storeDictApiService.getStoreDict("storeType", oldStore.getStoreType().toString());
+                sb.append("【").append(oldStoreType.getResult().getKey()).append("】");
+            }
             ServiceResponse<StoreDictDTO> newStoreType = this.storeDictApiService.getStoreDict("storeType", newStore.getStoreType().toString());
-            sb.append("门店类型").append("【").append(oldStoreType.getResult().getKey()).append("】")
-                        .append("变更为【").append(newStoreType.getResult().getKey()).append("】");
+            sb.append("变更为【").append(newStoreType.getResult().getKey()).append("】");
         }
         if (newStore.getErpStatus() != null && !newStore.getErpStatus().equals(oldStore.getErpStatus())) {
-            ServiceResponse<StoreDictDTO> oldStoreStatus = this.storeDictApiService.getStoreDict("storeStatus", oldStore.getErpStatus().toString());
+            sb.append("门店状态");
+            if (oldStore.getErpStatus() != null) {
+                ServiceResponse<StoreDictDTO> oldStoreStatus = this.storeDictApiService.getStoreDict("storeStatus", oldStore.getErpStatus().toString());
+                sb.append("【").append(oldStoreStatus.getResult().getKey()).append("】");
+            }
             ServiceResponse<StoreDictDTO> newStoreStatus = this.storeDictApiService.getStoreDict("storeStatus", newStore.getErpStatus().toString());
-            sb.append("门店状态").append("【").append(oldStoreStatus.getResult().getKey()).append("】")
-                        .append("变更为【").append(newStoreStatus.getResult().getKey()).append("】");
+            sb.append("变更为【").append(newStoreStatus.getResult().getKey()).append("】");
         }
         if (StringUtils.isNotBlank(newStore.getConactsPhone()) && !StringUtils.equals(newStore.getConactsPhone(), oldStore.getConactsPhone())) {
             sb.append("门店电话").append("【").append(oldStore.getConactsPhone()).append("】")

gic-store-api/src/main/java/com/gic/store/utils/field/FieldBase.java → gic-store-service/src/main/java/com/gic/store/utils/field/FieldBase.java

@@ -2,6 +2,7 @@ package com.gic.store.utils.field;
 
 
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
 
@@ -48,7 +49,7 @@ public class FieldBase {
     }
 
     public String validate(String value){
-        if (getIsMust() && (value == null || "".equals(value))) {
+        if (getIsMust() && (StringUtils.isNotBlank(value))) {
             return "不能为空";
         }else {
             return null;
@@ -60,7 +61,7 @@ public class FieldBase {
         if (msg != null) {
             return msg;
         }
-        if (value != null && !"".equals(value.trim()) && CollectionUtils.isNotEmpty(nameList)) {
+        if (StringUtils.isNotBlank(value) && CollectionUtils.isNotEmpty(nameList)) {
             String[] values = value.split(",");
             for (String val : values) {
                 boolean exist = false;

gic-store-api/src/main/java/com/gic/store/utils/field/TextField.java → gic-store-service/src/main/java/com/gic/store/utils/field/TextField.java

 package com.gic.store.utils.field;
 
 import com.gic.store.constant.StoreFieldTextEnum;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -60,7 +61,7 @@ public class TextField extends FieldBase {
         if (msg != null) {
             return msg;
         }
-        if (value == null || "".equals(value)) {
+        if (StringUtils.isBlank(value)) {
             return null;
         }