jiangjiazhi / regional-platform

Authored by liquanyu over 6 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 4 additions and 4 deletions

...	...	@@ -226,7 +226,7 @@
226	226	{
227	227	for (AddressBean bean : addressBeanList)
228	228	{
229		- if (StringUtils.isNotEmpty(bean.getP())) {
	229	+ if (bean != null && StringUtils.isNotEmpty(bean.getP())) {
230	230	OrganizationQuery organizationQuery = new OrganizationQuery();
231	231	organizationQuery.setYn(YnEnums.YES.getId());
232	232	organizationQuery.setProvinceId(bean.getP());

...	...	@@ -1143,7 +1143,7 @@
1143	1143	{
1144	1144	for (AddressBean bean : addressBeanList)
1145	1145	{
1146		- if (bean.getP().equals(cqSieveQueryRequest.getProvinceId()) && StringUtils.isNotEmpty(bean.getC()))
	1146	+ if (bean != null && bean.getP().equals(cqSieveQueryRequest.getProvinceId()) && StringUtils.isNotEmpty(bean.getC()))
1147	1147	{
1148	1148	ids.add(bean.getC());
1149	1149	}
...	...	@@ -1161,7 +1161,7 @@
1161	1161	{
1162	1162	for (AddressBean bean : addressBeanList)
1163	1163	{
1164		- if (bean.getC().equals(cqSieveQueryRequest.getCityId()) && StringUtils.isNotEmpty(bean.getA()))
	1164	+ if (bean != null && bean.getC().equals(cqSieveQueryRequest.getCityId()) && StringUtils.isNotEmpty(bean.getA()))
1165	1165	{
1166	1166	ids.add(bean.getA());
1167	1167	}
...	...	@@ -1390,7 +1390,7 @@
1390	1390	{
1391	1391	for (AddressBean bean : addressBeanList)
1392	1392	{
1393		- if (bean.getC().equals(cityId) && StringUtils.isNotEmpty(bean.getA()))
	1393	+ if (bean != null && bean.getC().equals(cityId) && StringUtils.isNotEmpty(bean.getA()))
1394	1394	{
1395	1395	ids.add(bean.getA());
1396	1396	}