fix: check rbac on env if envName is present (#5765)

* admin check fix in config draft

* minor fix

Author: prakash100198

api/restHandler/DeploymentConfigurationRestHandler.go

@@ -115,9 +115,11 @@ func (handler *DeploymentConfigurationRestHandlerImpl) enforceForAppAndEnv(appNa
 		return false
 	}
 
-	object = handler.enforcerUtil.GetEnvRBACNameByAppAndEnvName(appName, envName)
-	if ok := handler.enforcer.Enforce(token, casbin.ResourceEnvironment, action, object); !ok {
-		return false
+	if len(envName) > 0 {
+		object = handler.enforcerUtil.GetEnvRBACNameByAppAndEnvName(appName, envName)
+		if ok := handler.enforcer.Enforce(token, casbin.ResourceEnvironment, action, object); !ok {
+			return false
+		}
 	}
 	return true
 }

pkg/configDiff/DeploymentConfigurationService.go

@@ -63,6 +63,7 @@ func (impl *DeploymentConfigurationServiceImpl) ConfigAutoComplete(appId int, en
 		if _, ok := cmcsKeyPropertyEnvLevelMap[key]; !ok {
 			if envId > 0 {
 				configProperty.ConfigStage = bean2.Inheriting
+				configProperty.Id = 0
 			}
 
 		}