Merge branch 'dev_customize' into dev_temp

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

@@ -174,8 +174,8 @@ public class CustomerFunctionDetailServiceImpl extends BaseServiceImpl<CustomerF
             List<String> listFunctionIds = customerFunctionRoleDao.selectFunctionList(formDTO);
 
             //4.封装结果数据
-            listFunctionIds.forEach(id -> {
-                list.forEach(l -> {
+            list.forEach(l -> {
+                listFunctionIds.forEach(id -> {
                     if (id.equals(l.getFunctionId())) {
                         restltList.add(l);
                     }