From 352c936f4fe1841b243cc8f35e65c409826e30b4 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Wed, 2 Sep 2020 10:21:25 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=AE=9A=E5=88=B6=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9-=E6=94=AF=E6=8C=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=AF=B4=E6=98=8E=E3=80=822.=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2sql=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/controller/FunctionCustomizedController.java    | 2 +-
 .../java/com/epmet/service/FunctionCustomizedService.java | 2 +-
 .../epmet/service/impl/FunctionCustomizedServiceImpl.java | 8 ++++----
 .../src/main/resources/mapper/FunctionCustomizedDao.xml   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionCustomizedController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionCustomizedController.java
index fd82ce4fb6..8326a0a528 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionCustomizedController.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionCustomizedController.java
@@ -143,7 +143,7 @@ public class FunctionCustomizedController {
     /**
      * 定制功能修改
      * 有客户在使用该功能时则不允许修改上下架状态、业务域名和外链地址、所属端app,
-     *                  只能修改功能名称和大小图标
+     *                  只能修改功能名称和大小图标、功能说明
      * 修改的要判断是否有客户在使用，有用的要批量更新已使用客户数据
      *
      * @param formDTO
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/FunctionCustomizedService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/FunctionCustomizedService.java
index a02b628755..24411c0d80 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/FunctionCustomizedService.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/FunctionCustomizedService.java
@@ -130,7 +130,7 @@ public interface FunctionCustomizedService extends BaseService<FunctionCustomize
     /**
      * 定制功能修改
      * 有客户在使用该功能时则不允许修改上下架状态、业务域名和外链地址、所属端app,
-     *                  只能修改功能名称和大小图标
+     *                  只能修改功能名称和大小图标、功能说明
      * 修改的要判断是否有客户在使用，有用的要批量更新已使用客户数据
      *
      * @param formDTO
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java
index 203b336cf9..9a7a1dc122 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java
@@ -200,18 +200,18 @@ public class FunctionCustomizedServiceImpl extends BaseServiceImpl<FunctionCusto
                             && customizedDTO.getIconSmallImg().equals(customizedId.get(i).getIconSmallImg())
                             && customizedDTO.getDomainName().equals(customizedId.get(i).getDomainName())
                             && customizedDTO.getTargetLink().equals(customizedId.get(i).getTargetLink()) ){
-                            // 这个功能，客户使用的是默认的，则判断本次修改的字段，如果是功能名称和大小图标，则批量更新客户数据，负责提示 不能修改
+                            // 这个功能，客户使用的是默认的，则判断本次修改的字段，如果是功能名称和大小图标、功能说明，则批量更新客户数据，负责提示 不能修改
                             if (!formDTO.getShoppingStatus().equals(customizedDTO.getShoppingStatus())
-                                    || !formDTO.getFunctionExplain().equals(customizedDTO.getFunctionExplain())
                                     || !formDTO.getTargetLink().equals(customizedDTO.getTargetLink())
                                     || !formDTO.getDomainName().equals(customizedDTO.getDomainName())
                                     || !formDTO.getFromApp().equals(customizedDTO.getFromApp()) ){
                                 // 4.1 如果修改的内容是其他字段，则返回语句
                                 tipCustomizedInfoUserId.append(customizedId.get(i).getId() + ",");
                             } else if (!formDTO.getFunctionName().equals(customizedDTO.getCustomizedName())
+                                        || !formDTO.getFunctionExplain().equals(customizedDTO.getFunctionExplain())
                                         || !formDTO.getIconLargeImg().equals(customizedDTO.getIconLargeImg())
                                         || !formDTO.getIconSmallImg().equals(customizedDTO.getIconSmallImg())){
-                                // 4.2 如果修改的内容只是：功能名称和大小图标，, 需要批量更新客户数据
+                                // 4.2 如果修改的内容只是：功能名称和大小图标、功能说明，, 需要批量更新客户数据
                                 CustomerFunctionDetailEntity customer = new CustomerFunctionDetailEntity();
                                 customer.setFunctionName(formDTO.getFunctionName());
                                 customer.setIconLargeImg(formDTO.getIconLargeImg());
@@ -340,9 +340,9 @@ public class FunctionCustomizedServiceImpl extends BaseServiceImpl<FunctionCusto
         entity.setId(formDTO.getFunctionId());
         entity.setFunctionName(formDTO.getFunctionName());
         entity.setFunctionIcon(formDTO.getIconLargeImg());
+        entity.setFunctionExplain(formDTO.getFunctionExplain());
         if (NumConstant.ONE == flag){
             entity.setShoppingStatus(Integer.valueOf(formDTO.getShoppingStatus()));
-            entity.setFunctionExplain(formDTO.getFunctionExplain());
         }
         functionService.updateById(entity);
     }
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/FunctionCustomizedDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/FunctionCustomizedDao.xml
index cf95c91a43..a9840f4e42 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/FunctionCustomizedDao.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/FunctionCustomizedDao.xml
@@ -66,7 +66,7 @@
             AND cu.CUSTOMIZED_NAME like concat('%', #{customizedName}, '%')
         </if>
         <if test="fromApp != null and fromApp.trim() != ''">
-            AND cu.FROM_APP = 'gov'
+            AND cu.FROM_APP = #{fromApp}
         </if>
 		ORDER BY cu.FROM_APP, f.CREATED_TIME DESC
     </select>
@@ -84,7 +84,7 @@
             AND cu.CUSTOMIZED_NAME like concat('%', #{customizedName}, '%')
         </if>
         <if test="fromApp != null and fromApp.trim() != ''">
-            AND cu.FROM_APP = 'gov'
+            AND cu.FROM_APP = #{fromApp}
         </if>
     </select>
     <select id="selectDomains" resultType="com.epmet.dto.FunctionCustomizedDTO">