Browse Source

企业电话和管理员电话的公共接口完善;

zhaohongpeng 7 years ago
parent
commit
1ef526d9cd

+ 3 - 0
src/main/java/com/uas/platform/b2c/common/account/controller/EnterpriseController.java

@@ -320,6 +320,9 @@ public class EnterpriseController {
 	 */
 	@RequestMapping(value = "/{enuu}/tels", method = RequestMethod.GET)
 	public ResultMap getEntelAndAdmintel(@PathVariable Long enuu){
+		if (enuu == null) {
+			throw new IllegalArgumentException("企业uu没有传值!");
+		}
 		return enterpriseService.getEntelAndAdmintel(enuu);
 	}
 }

+ 4 - 3
src/main/java/com/uas/platform/b2c/common/account/service/impl/EnterpriseServiceImpl.java

@@ -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;