#328-4 非结构化计算价格公式偶先窗口无法弹出

OBE-COMPONENTS/src/com/gx/obe/formula/composite/ScoreCalculationComposite.java

@@ -367,13 +367,13 @@ public class ScoreCalculationComposite extends Composite {
 	 * @author guoyr 
 	 */
 	private void divisorChangeAction(){
-		if(CalculationParam.EMPTY.equals(WidgetUtils.getComboSelection(divisor_combo).toString())){
-			divisorPre.setVisible(false);
-			divisorPercent.setVisible(false);
-		}else {
+//		if(CalculationParam.EMPTY.equals(WidgetUtils.getComboSelection(divisor_combo).toString())){
+//			divisorPre.setVisible(false);
+//			divisorPercent.setVisible(false);
+//		}else {
 		divisorPre.setVisible(true);
 		divisorPercent.setVisible(true);
-		}
+//		}
 	}
 
 	/**

org.eclipse.swt.core/src/org/eclipse/swt/core/utils/WidgetUtils.java

@@ -159,7 +159,7 @@ public static final Color ERROR_COLOR = SWTResourceManager.getColor(SWT.COLOR_RE
 	 * @Exception   
 	 */
 	public static Object getComboSelection(Combo c){
-		return c.getData(c.getSelectionIndex()+"");
+		return null == c.getData(c.getSelectionIndex()+"") ? "-1" : c.getData(c.getSelectionIndex()+"");
 	}
 
 	/**