Merge branch 'mazq-serviceresult-0426' into 'release/v2.1.0-beta'

feature(测试代码修改): 测试代码修改

See merge request dcuc-tjdsj/app-service!17

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/business/impl/ResourceBusiness.java

@@ -489,8 +489,7 @@ public class ResourceBusiness implements IResourceBusiness {
         if(CollectionUtils.isEmpty(extAppIds)){
             return;
         }
-//        String idcard = UserContextUtils.getCurrentUser().getIdcard();
-        String idcard = resourceConfig.getBusSreIdcard();
+        String idcard = UserContextUtils.getCurrentUser().getIdcard();
         executor.submit(new MenuTask(extAppIds, idcard));
     }
 
@@ -559,8 +558,7 @@ public class ResourceBusiness implements IResourceBusiness {
         //获取服务资源
         //服务资源提供方一次查询所有服务资源,未采用分页获取方式
         String busSraId = resourceConfig.getBusSraId();
-//        String busSreIdcard = UserContextUtils.getCurrentUser().getIdcard();
-        String busSreIdcard = resourceConfig.getBusSreIdcard();
+        String busSreIdcard = UserContextUtils.getCurrentUser().getIdcard();
         String busServiceId = resourceConfig.getServiceResource().getBusServiceId();
         String busServiceFunc = resourceConfig.getServiceResource().getBusServiceFunc();
         List<Header> headerList = getHeaders(busSraId, busSreIdcard, busServiceId, busServiceFunc);
@@ -666,8 +664,7 @@ public class ResourceBusiness implements IResourceBusiness {
         map.put("size",pageSize);
         String param = JSON.toJSONString(map);
         String busSraId = resourceConfig.getBusSraId();
-//        String busSreIdcard = UserContextUtils.getCurrentUser().getIdcard();
-        String busSreIdcard = resourceConfig.getBusSreIdcard();
+        String busSreIdcard = UserContextUtils.getCurrentUser().getIdcard();
         String busServiceId = resourceConfig.getAppResource().getBusServiceId();
         String busServiceFunc = resourceConfig.getAppResource().getBusServiceFunc();
         List<Header> headerList = getHeaders(busSraId, busSreIdcard, busServiceId, busServiceFunc);