邀请企业时增加判断

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@8439 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/service/impl/InvitationRecordServiceImpl.java

@@ -48,8 +48,12 @@ public class InvitationRecordServiceImpl implements InvitationRecordService {
 		if (oldrecord != null) {
 			oldrecord.setCount(oldrecord.getCount() + 1);
 			oldrecord.setDate(new Date());
-			oldrecord.setVendusertel(record.getVendusertel().trim());
-			oldrecord.setVenduseremail(record.getVenduseremail());
+			if (record.getVendusertel() != null) {
+				oldrecord.setVendusertel(record.getVendusertel().trim());
+			}
+			if (record.getVenduseremail() != null) {
+				oldrecord.setVenduseremail(record.getVenduseremail().trim());
+			}
 			invitationRecordDao.save(oldrecord);
 			if (oldrecord.getVenduseremail() != null) {
 				mailService.send(messageConf.getTplInvitationForB2B(), record.getVenduseremail(), model);

src/main/webapp/resources/js/index/app.js

@@ -13715,7 +13715,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 	}]);
     
     // 企业圈搜索结果
-    app.controller('EnterpriseSearchCtrl', ['$scope', 'getAccountUserSpace', 'ngTableParams', '$filter', 'BaseService', 'toaster', 'AddPartner', '$rootScope', '$modal', function($scope, getAccountUserSpace, ngTableParams, $filter, BaseService, toaster, AddPartner, $rootScope, $modal) {
+    app.controller('EnterpriseSearchCtrl', ['$scope', 'getAccountUserSpace', 'ngTableParams', '$filter', 'BaseService', 'toaster', 'AddPartner', '$rootScope', '$modal', 'InvitationRecord', function($scope, getAccountUserSpace, ngTableParams, $filter, BaseService, toaster, AddPartner, $rootScope, $modal, InvitationRecord) {
     	$scope.status = 'add';
     	BaseService.scrollBackToTop();
 		$scope.active = 'all';

src/main/webapp/resources/tpl/index/baseInfo/searchresult.html

@@ -288,6 +288,9 @@
 			<div class="col-xs-4">
 				<p>搜索到<em>{{tableParams.total()}}</em>条</p>
 			</div>
+			<div class="col-xs-6">
+				<span ><botton ng-click="invite(tip)" class="text-inverse" >立即邀请</botton><span ng-if="tip != null">({{tip}})注册优软云</span></span>
+			</div>
 		</div>
 	</div>
 <table class="enterprise-table block" ng-table="tableParams">