Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/main/java/com/uas/platform/b2c/core/filter/SSOInterceptor.java

src/main/java/com/uas/platform/b2c/core/filter/SSOInterceptor.java

@@ -203,18 +203,14 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
         }
         // 暂时在正式 过滤admin访问权限
         if (needPermission != null) {
-            if ("prod".equals(profile)) {
-                if (!user.getEnterprise().getUu().toString().equals(enUU)) {
-                    throw new AccessDeniedException("无法访问，没有 " + needPermission + " 权限！");
-                } else {
-                    if (user.getEnterprise().getUu().toString().equals(enUU)) {
-                        if (!"登录商城后台进行运维管理".equals(needPermission)) {
-                            throw new AccessDeniedException("无法访问，没有 " + needPermission + " 权限！");
-                        }
+            if (!user.getEnterprise().getUu().toString().equals(enUU)) {
+                throw new AccessDeniedException("无法访问，没有 " + needPermission + " 权限！");
+            } else {
+                if (user.getEnterprise().getUu().toString().equals(enUU)) {
+                    if (!"登录商城后台进行运维管理".equals(needPermission)) {
+                        throw new AccessDeniedException("无法访问，没有 " + needPermission + " 权限！");
                     }
                 }
-            } else {
-                throw new AccessDeniedException("无法访问，没有 " + needPermission + " 权限！");
             }
         }
     }