自有商户详情接口修改

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/union/UnionEnterpriseAuthController.java

@@ -277,8 +277,10 @@ public class UnionEnterpriseAuthController {
      * @return
      */
     @RequestMapping("/user-area")
-    public RestResponse channelResource(Integer resourceGroupId, Integer enterpriseId) {
-        Integer ownEnterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
+    public RestResponse channelResource(Integer resourceGroupId, Integer enterpriseId, Integer ownEnterpriseId) {
+        if (ownEnterpriseId == null) {
+            ownEnterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
+        }
         UnionEnterpriseAuthDTO old = checkUnionEnterpriseAuth(ownEnterpriseId, enterpriseId);
 
         if (old.getResourceGroupId() != null && !old.getResourceGroupId().equals(resourceGroupId)) {
@@ -608,7 +610,7 @@ public class UnionEnterpriseAuthController {
 
             //用户域数据
             Map<Integer, Object> areaMap = new HashMap<>();
-            RestResponse userArea = channelResource(old.getResourceGroupId(), unionEnterpriseId);
+            RestResponse userArea = channelResource(old.getResourceGroupId(), unionEnterpriseId, ownEnterpriseId);
             if ("0000".equals(userArea.getCode())) {
                 areaMap = (Map<Integer, Object>) userArea.getResult();
             }