From a0dcbd07b6ae4a466d6c4733052a60b48d081cfb Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Tue, 1 Sep 2020 15:06:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E5=88=B6=E5=8A=9F=E8=83=BD=E4=B8=8A?=
 =?UTF-8?q?=E6=9E=B6=20-=20=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CustomerFunctionDetailServiceImpl.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java
index 2b599a211a..d57623db5d 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java
@@ -155,15 +155,13 @@ public class CustomerFunctionDetailServiceImpl extends BaseServiceImpl<CustomerF
     public Result updateShoppingStatus(UpdateShoppingStatusFormDTO formDTO) {
         // 用户定制功能上架，需判断，已上架的数量是否超过12
         if (NumConstant.ONE_STR.equals(formDTO.getShoppingStatus())){
-            // 根据functionId，customerId、所属端，查询当前客户 现已上架的 功能数量。
+            // 根据functionId，customerId，查询当前客户所属端 现已上架的 功能数量。
             CustomerFunctionDetailDTO functionDetailDTO = new CustomerFunctionDetailDTO();
             functionDetailDTO.setFunctionId(formDTO.getFunctionId());
             functionDetailDTO.setCustomerId(formDTO.getCustomerId());
             CustomerFunctionCollectResultDTO functionNum = baseDao.sumCustomerFunctionNum(functionDetailDTO);
-            if (null != functionNum){
-                if (NumConstant.TWELVE <= functionNum.getNum()){
-                    return new Result().error(8000,"当前客户"+ functionNum.getFromAppName() +"已上架12个定制功能。不能继续上架！");
-                }
+            if (NumConstant.TWELVE <= functionNum.getNum()){
+                return new Result().error(EpmetErrorCode.SERVER_ERROR.getCode(),"当前客户"+ functionNum.getFromAppName() +"已上架12个定制功能。不能继续上架！");
             }
         }
         // 修改 客户定制功能详情表，上下架状态