Merge branch 'master' of http://git.shengws.com/csx/XT_New

controllers/base_api_controller.go

@@ -69,8 +69,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		//userAdmin.Id = 400
 		//userAdmin.Mobile = "13535547901"
 		//
-		//userAdmin.Id = 597
-		//userAdmin.Mobile = "19874122664"
+		////userAdmin.Id = 597
+		////userAdmin.Mobile = "19874122664"
 		//userAdmin.IsSuperAdmin = false
 		//userAdmin.Status = 1
 		//userAdmin.CreateTime = 1530786071
@@ -100,7 +100,6 @@ func (this *BaseAuthAPIController) Prepare() {
 	adminUserInfo := this.GetAdminUserInfo()
 
 	if this.Ctx.Request.Header.Get("Permission") == "2" {
-		fmt.Println("1111111")
 		org, _ := service.GetOrgById(adminUserInfo.CurrentOrgId)
 		if adminUserInfo.AdminUser.Id != org.Creator { //超级管理员不受此限制
 

controllers/verify_login_controller.go

@@ -161,12 +161,12 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 				}
 			}
 
+			var pruviews []*models.Purview
 			var curAppUrlfors []string
 			if len(curAppUrlfors) == 0 {
 				if adminUser.Id == curOrg.Creator { //超级管理员
 					urlfors, _, _ := service.GetSuperAdminUsersPurviewTreeAndUrlfors(3)
 					curAppUrlfors = urlfors
-
 				} else {
 					appRole, _ := service.FindAdminUserIDA(appRole.Id)
 					if appRole.Id > 0 && len(appRole.RoleIds) > 0 {
@@ -181,33 +181,54 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 								ids = ids + "," + purview_ids
 							}
 						}
-						pruviews, _ := service.GetPurviewById(ids)
-						for _, item := range pruviews {
-							if item.Module == 3 && item.Parentid > 0 {
-								fmt.Println(item.Urlfor)
-								curAppUrlfors = append(curAppUrlfors, item.Urlfor)
+						if len(ids) != 0 {
+							pruviews, _ = service.GetPurviewById(ids)
+							for _, item := range pruviews {
+								if item.Module == 3 && item.Parentid > 0 {
+									fmt.Println(item.Urlfor)
+									curAppUrlfors = append(curAppUrlfors, item.Urlfor)
+								}
 							}
+						} else {
+
+							curAppUrlfors = append(curAppUrlfors, "")
 						}
 					}
 				}
 			}
 
+			var didRegistedForSCRM bool = false
+			var didRegistedForCDM bool = false
+			var didRegistedForMall bool = false
+
+			for _, item := range pruviews {
+				if item.Module == 6 {
+					didRegistedForSCRM = true
+				}
+				if item.Module == 4 {
+					didRegistedForCDM = true
+				}
+				if item.Module == 7 {
+					didRegistedForMall = true
+				}
+			}
+
 			subscibe, _ := service.GetOrgSubscibe(adminUserInfo.CurrentOrgId)
 
 			this.SetSession("admin_user_info", adminUserInfo)
 
 			this.ServeSuccessJSON(map[string]interface{}{
-				"user":           userInfo,
-				"org":            org,
-				"urlfors":        curAppUrlfors,
-				"current_org_id": adminUserInfo.CurrentOrgId,
-				"current_app_id": adminUserInfo.CurrentAppId,
-				"subscibe":       subscibe,
-				//"scrm_role_exist": didRegistedForSCRM,
-				//"cdm_role_exist":  didRegistedForCDM,
-				//"mall_role_exist": didRegistedForMall,
-				"template_info": template_info,
-				"fileds":        FiledList,
+				"user":            userInfo,
+				"org":             org,
+				"urlfors":         curAppUrlfors,
+				"current_org_id":  adminUserInfo.CurrentOrgId,
+				"current_app_id":  adminUserInfo.CurrentAppId,
+				"subscibe":        subscibe,
+				"scrm_role_exist": didRegistedForSCRM,
+				"cdm_role_exist":  didRegistedForCDM,
+				"mall_role_exist": didRegistedForMall,
+				"template_info":   template_info,
+				"fileds":          FiledList,
 			})
 			return
 		}