Antiloveg 8 years ago
parent
commit
a527874b73

+ 7 - 2
src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java

@@ -178,8 +178,13 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 		 */
 		cog.setFirstCatagory(null == firstCatagory ? 0 : firstCatagory);
 		cog.setSecondCatagory(null == secondCatagory ? 0 : secondCatagory);
-		cog.setFirmTotal(null == ohr.getFirmTotal() ? 0 : ohr.getFirmTotal());
-		cog.setTechTotal(null == ohr.getTechTotal() ? 0 : ohr.getTechTotal());
+		if (null != ohr) {
+			cog.setFirmTotal(null == ohr.getFirmTotal() ? 0 : ohr.getFirmTotal());
+			cog.setTechTotal(null == ohr.getTechTotal() ? 0 : ohr.getTechTotal());
+		} else {
+			cog.setFirmTotal(0);
+			cog.setTechTotal(0);
+		}
 		cog.setTotalRevenue(null == totalRevenue ? new BigDecimal(0) : totalRevenue);
 		// }