Merge branch 'dev_plugins' into dev_temp

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java

@@ -148,8 +148,8 @@ public class FunctionCustomizedServiceImpl extends BaseServiceImpl<FunctionCusto
         FunctionCustomizedDetailResultDTO resultDTO = baseDao.getFunctionCustomizedByFunctionId(formDTO);
 
         //2.查询是否有客户在使用当前定制功能
-        CustomerFunctionDetailEntity entity = customerFunctionDetailService.selectById(formDTO.getFunctionId());
+        List<CustomerFunctionDetailDTO> list = customerFunctionDetailDao.selectCustomerIdByFunctionId(formDTO.getFunctionId());
-        if (null == entity || null == entity.getFunctionId()) {
+        if (null == list || list.size() < NumConstant.ONE) {
             resultDTO.setIsApply(NumConstant.ZERO);
         } else {
             resultDTO.setIsApply(NumConstant.ONE);