Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT.git

wanghui 8 years ago
parent
commit
f3b079a25a

+ 1 - 1
src/main/java/com/goafanti/common/controller/PortalController.java

@@ -103,7 +103,7 @@ public class PortalController extends BaseController {
 						s.setIndustryCategory((hasCategoryA ? s.getIndustryCategoryAS() : "")
 								+ (hasCategoryA && hasCategoryB ? DELIMITER : "")
 								+ (hasCategoryB ? s.getIndustryCategoryBS() : ""));
-						if (null != s.getBudgetCost() || s.getBudgetCost().compareTo(BigDecimal.ZERO) > 0) {
+						if (null != s.getBudgetCost() && s.getBudgetCost().compareTo(BigDecimal.ZERO) > 0) {
 							s.setBudgetCostS(s.getBudgetCost() + UNIT);
 						} else {
 							s.setBudgetCostS(PRICE_NEGOTIABLE);

File diff suppressed because it is too large
+ 66 - 47
src/main/webapp/WEB-INF/views/common.html