Browse Source

新的合作伙伴页点击同意或拒绝刷新当前页面,邀请记录页搜索框调整,点击添加根据营业执照查不到企业是,返回错误。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@9449 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
dongbw 8 years ago
parent
commit
ef75c6be02

+ 4 - 0
src/main/java/com/uas/platform/b2b/service/impl/AddPartnerServiceImpl.java

@@ -136,6 +136,10 @@ public class AddPartnerServiceImpl implements AddPartnerService {
 		Enterprise vendEnter = enterpriseDao.findEnterpriseByEnBussinessCode(businessCode);
 		Enterprise myEnter = SystemSession.getUser().getEnterprise();
 		ModelMap map = new ModelMap();
+		if (vendEnter == null) {
+			map.put("error","未查找到对应企业,请确认信息是否正确");
+			return map;
+		}
 		// 先判断是否为供应商
 		List<Vendor> oldVendor = vendorDao.findByMyEnUUAndVendUU(myEnter.getUu(), vendEnter.getUu());
 		if (!CollectionUtils.isEmpty(oldVendor)) {

+ 2 - 2
src/main/webapp/resources/js/index/app.js

@@ -11917,7 +11917,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.agree = function(id) {
             AddPartner.agreeRequest({id: id}, {}, function(data) {
                 toaster.pop('success', '提示', '操作成功');
-                $scope.tableParams.reload();
+                $window.location.reload();
             }, function(response) {
                 toaster.pop('error', '提示', response.data);
             });
@@ -11931,7 +11931,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.refuse = function(id, reason) {
             AddPartner.refuseRequest({id: id, reason: reason}, {}, function(data) {
                 toaster.pop('success', '提示', '操作成功');
-                $scope.tableParams.reload();
+                $window.location.reload();
             }, function(response) {
                 toaster.pop('error', '提示', response.data);
             });

+ 2 - 2
src/main/webapp/resources/tpl/index/baseInfo/invitation.html

@@ -116,8 +116,8 @@
 				<div class="col-xs-9">
 					<div class="search">
 						<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
-							<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称、联系人、邀请人进行搜索" />
-							<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
+							<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch(keyword)" placeholder="输入企业名称、联系人、邀请人进行搜索" />
+							<a class="btn input-group-addon" ng-click="onSearch(keyword)">搜索</a>
 						</div>
 					</div>
 				</div>