From ce070cdf373affdb86c1ba1b7bd12c33eb80880b Mon Sep 17 00:00:00 2001
From: wans <747101512@qq.com>
Date: Mon, 31 May 2021 17:56:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9E=9A=E4=B8=BE=E7=B1=BBbu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tenlion/service/columnmng/impl/ColumnMngServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/cn/com/tenlion/service/columnmng/impl/ColumnMngServiceImpl.java b/src/main/java/cn/com/tenlion/service/columnmng/impl/ColumnMngServiceImpl.java
index d4c64c5..b0411c1 100644
--- a/src/main/java/cn/com/tenlion/service/columnmng/impl/ColumnMngServiceImpl.java
+++ b/src/main/java/cn/com/tenlion/service/columnmng/impl/ColumnMngServiceImpl.java
@@ -123,7 +123,7 @@ public class ColumnMngServiceImpl extends DefaultBaseService implements IColumnM
         List<ColumnMngDTO> list = columnMngDao.list(params);
         for (ColumnMngDTO item : list){
             String[] resourceTypeList = item.getResourceType().split(",");
-            if(resourceTypeList != null || !"".equals(resourceTypeList[0])){
+            if(resourceTypeList != null && !"".equals(resourceTypeList[0])){
                 String resourceTypeName = "";
                 for(int i = 0; i < resourceTypeList.length; i++){
                     resourceTypeName += MaterialTypeEnum.valueOf(resourceTypeList[i]).getTypeName() + ",";