集群管理bug修改

simulation-resource-server/src/main/java/com/css/simulation/resource/system/service/ClusterService.java

@@ -167,9 +167,15 @@ public class ClusterService {
             Integer assignedDynLicenseNum = clusterMapper.getAssignedDynLicenseNum(clusterParam);
 
             //当前普通账户的集群总数量减去已分配的数量
-            if(ObjectUtil.isNotNull(clusterVO) && clusterVO.getNumSimulationLicense() > assignedSimLicenseNum && clusterVO.getNumDynamicLicense() > assignedDynLicenseNum){
-                int validSimLicenseNum = clusterVO.getNumSimulationLicense() - assignedSimLicenseNum;
-                int validDynLicenseNum =  clusterVO.getNumDynamicLicense()  - assignedDynLicenseNum;
+            if(ObjectUtil.isNotNull(clusterVO)){
+                int validSimLicenseNum = clusterVO.getNumSimulationLicense();
+                int validDynLicenseNum =  clusterVO.getNumDynamicLicense();
+                if(ObjectUtil.isNotNull(assignedSimLicenseNum) && clusterVO.getNumSimulationLicense() >= assignedSimLicenseNum){
+                    validSimLicenseNum = validSimLicenseNum - assignedSimLicenseNum;
+                }
+                if(ObjectUtil.isNotNull(assignedDynLicenseNum) && clusterVO.getNumDynamicLicense() >= assignedDynLicenseNum){
+                    validDynLicenseNum = validDynLicenseNum - assignedDynLicenseNum;
+                }
 
                 clusterVO.setValidNumSimLicense(validSimLicenseNum);
                 clusterVO.setValidNumDynLicense(validDynLicenseNum);