Browse Source

加入邀请默认条件添加companyId

hy 7 years ago
parent
commit
74c269c178

+ 1 - 1
frontend/saas-web/app/view/main/Main.js

@@ -134,7 +134,7 @@ Ext.define('saas.view.main.Main', {
                                 if(rolesMap&&rolesMap.length>0){
                                 if(rolesMap&&rolesMap.length>0){
                                     for(var i = 0; i < rolesMap.length; i++) {
                                     for(var i = 0; i < rolesMap.length; i++) {
                                         if(rolesMap[i].type==0){
                                         if(rolesMap[i].type==0){
-                                             main.getController().loadInvitationMsg(1)
+                                             main.getController().loadInvitationMsg(1,nowCompanyId)
                                         }
                                         }
                                      }
                                      }
                                 }
                                 }

+ 5 - 2
frontend/saas-web/app/view/main/MainController.js

@@ -117,13 +117,16 @@ Ext.define('saas.view.main.MainController', {
         win.show();
         win.show();
     },
     },
 
 
-    loadInvitationMsg: function(count) {
+    loadInvitationMsg: function(count,nowCompanyId) {
         var me = this.view;//视图层
         var me = this.view;//视图层
         var hasInvitationMsg = false;
         var hasInvitationMsg = false;
         //查询后台
         //查询后台
         var param = [{
         var param = [{
             type:'condition',
             type:'condition',
             value:"re_status=2"
             value:"re_status=2"
+        },{
+            type:'condition',
+            value:"companyId="+nowCompanyId
         }]
         }]
         Ext.Ajax.request({  
         Ext.Ajax.request({  
             url :'/api/commons/remind/apply/list',
             url :'/api/commons/remind/apply/list',
@@ -162,7 +165,7 @@ Ext.define('saas.view.main.MainController', {
             }, 300);
             }, 300);
         }
         }
         setTimeout(function() {
         setTimeout(function() {
-            me.getController().loadInvitationMsg(count+1);
+            me.getController().loadInvitationMsg(count+1,nowCompanyId);
         }, 8000);
         }, 8000);
     },
     },
 
 

+ 7 - 1
frontend/saas-web/app/view/sys/invitation/DataList.js

@@ -208,8 +208,14 @@ Ext.define('saas.view.sys.invitation.DataList', {
                     beforeload: function (store, op) {
                     beforeload: function (store, op) {
                         var condition = me.condition;
                         var condition = me.condition;
                         if (Ext.isEmpty(condition)) {
                         if (Ext.isEmpty(condition)) {
-                            condition = '';
+                            condition = [];
                         }
                         }
+                        var _localStorage = Ext.decode(localStorage.getItem('app-state-session'));
+                        var nowCompanyId = _localStorage.account.companyId;
+                        condition.push({
+                            type:'condition',
+                            value:"companyId="+nowCompanyId
+                        });
                         Ext.apply(store.proxy.extraParams, {
                         Ext.apply(store.proxy.extraParams, {
                             number: op._page,
                             number: op._page,
                             size: store.pageSize,
                             size: store.pageSize,