|
|
@@ -272,14 +272,15 @@ public class EnterpriseServiceImpl implements EnterpriseService{
|
|
|
ResultMap resultMap = new ResultMap();
|
|
|
HashMap<String, String> tels = new HashMap<>();
|
|
|
Enterprise enterprise = enterpriseDao.findOne(enUU);
|
|
|
- if (enterprise.getEnAdminuu() != null) {
|
|
|
+ if (enterprise != null && enterprise.getEnAdminuu() != null) {
|
|
|
UserBaseInfo userBaseInfo = userBaseInfoDao.findUserByUserUU(enterprise.getEnAdminuu());
|
|
|
if (!StringUtils.isEmpty(userBaseInfo.getUserTel())) {
|
|
|
- tels.put("adminTel",userBaseInfo.getUserTel());
|
|
|
+ tels.put("adminTel", userBaseInfo.getUserTel());
|
|
|
}
|
|
|
}
|
|
|
- if (!StringUtils.isEmpty(enterprise.getEnTel())) {
|
|
|
+ if (enterprise != null && !StringUtils.isEmpty(enterprise.getEnTel())) {
|
|
|
tels.put("entel", enterprise.getEnTel());
|
|
|
+ tels.put("enuu", enterprise.getUu()+"");
|
|
|
}
|
|
|
resultMap.setData(tels);
|
|
|
return resultMap;
|