|
|
@@ -80,10 +80,10 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
.selectProvinceWhereCityIsNullByAdminId(TokenManager.getAdminId());
|
|
|
List<Integer> cityList = adminLocationMapper.selectCityByAdminId(TokenManager.getAdminId());
|
|
|
provinceList.addAll(cityList);
|
|
|
- if (null != provinceList && provinceList.size() > 0){
|
|
|
+ if (null != provinceList && provinceList.size() > 0) {
|
|
|
params.put("provinceList", provinceList);
|
|
|
}
|
|
|
- if (null != cityList && cityList.size() > 0){
|
|
|
+ if (null != cityList && cityList.size() > 0) {
|
|
|
params.put("cityList", cityList);
|
|
|
}
|
|
|
return (Pagination<AdminListBo>) findPage("findAreaAdminListByPage", "findAreaAdminCount", params, pageNo,
|
|
|
@@ -210,7 +210,9 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
|
|
|
@Override
|
|
|
public int insertNewAdmin(Admin ad, List<AdminLocation> adminLocationList) {
|
|
|
- adminLocationMapper.insertBatch(adminLocationList);
|
|
|
+ if (!adminLocationList.isEmpty()) {
|
|
|
+ adminLocationMapper.insertBatch(adminLocationList);
|
|
|
+ }
|
|
|
return adminMapper.insert(ad);
|
|
|
}
|
|
|
|
|
|
@@ -236,5 +238,4 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
return map;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
}
|