Merge remote-tracking branch 'origin/master'

simulation-resource-server/src/main/resources/mapper/system/ClusterMapper.xml

@@ -133,14 +133,14 @@
     </select>
 
     <select id="getAssignedSimLicenseNum" parameterType="api.common.pojo.param.system.ClusterParam" resultType="java.lang.Integer">
-        select SUM(num_simulation_license) as AssignedSimLicenseNum from system_cluster
+        select IFNULL(SUM(num_simulation_license),0) as AssignedSimLicenseNum from system_cluster
         where is_deleted = '0' and DATE(date_simulation_license) >= DATE(NOW()) and create_user_id = #{createUserId,jdbcType=VARCHAR}
         <if test="userId != null and userId != ''">
             and  user_id != #{userId,jdbcType=VARCHAR}
         </if>
     </select>
     <select id="getAssignedDynLicenseNum" parameterType="api.common.pojo.param.system.ClusterParam" resultType="java.lang.Integer">
-        select SUM(num_dynamic_license) as AssignedDynLicenseNum from system_cluster
+        select  IFNULL(SUM(num_dynamic_license),0) as AssignedDynLicenseNum from system_cluster
         where is_deleted = '0' and DATE(date_dynamic_license) >= DATE(NOW()) and create_user_id = #{createUserId,jdbcType=VARCHAR}
         <if test="userId != null and userId != ''">
             and  user_id != #{userId,jdbcType=VARCHAR}