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

controllers/dialysis_api_controller.go

@@ -54,6 +54,8 @@ func DialysisApiRegistRouters() {
 
 	beego.Router("/api/dryweight/commit", &DialysisApiController{}, "Post:UploadDryWeight")
 
+	beego.Router("/api/func_per/get", &DialysisApiController{}, "Get:GetFuncPurview")
+
 }
 
 func (c *DialysisApiController) PostPrescription() {
@@ -4932,3 +4934,113 @@ func (c *DialysisApiController) UploadDryWeight() {
 	}
 
 }
+
+func (this *DialysisApiController) GetFuncPurview() {
+	adminUserInfo := this.GetAdminUserInfo()
+	user_id := adminUserInfo.AdminUser.Id
+	app_id := adminUserInfo.CurrentAppId
+	org_id := adminUserInfo.CurrentOrgId
+	create_url := this.GetString("create_url")
+	modify_url := this.GetString("modify_url")
+	modify_other_url := this.GetString("modify_other_url")
+	del_url := this.GetString("del_url")
+	del_other_url := this.GetString("del_other_url")
+	exce_url := this.GetString("exce_url")
+	check_url := this.GetString("check_url")
+	modify_exce_url := this.GetString("modify_exce_url")
+	module, _ := this.GetInt64("module", 0)
+
+	app_role, _ := service.GetAppRole(org_id, app_id, user_id)
+	var is_has_create bool
+	var is_has_modify bool
+	var is_has_modify_other bool
+	var is_has_del bool
+	var is_has_del_other bool
+	var is_has_exce bool
+	var is_has_check bool
+	var is_has_modify_exce bool
+
+	org, _ := service.GetOrgById(adminUserInfo.CurrentOrgId)
+
+	if adminUserInfo.AdminUser.Id != org.Creator {
+
+		if app_role != nil {
+			if len(app_role.RoleIds) > 0 {
+				roles := strings.Split(app_role.RoleIds, ",")
+				var userRolePurviews string
+				for _, item := range roles {
+					role_id, _ := strconv.ParseInt(item, 10, 64)
+					purviews, _ := service.GetRoleFuncPurviewIds(role_id)
+					if len(userRolePurviews) == 0 {
+						userRolePurviews = purviews
+					} else {
+						userRolePurviews = userRolePurviews + "," + purviews
+					}
+				}
+				userRolePurviewsArr := RemoveRepeatedPurviewElement2(strings.Split(userRolePurviews, ","))
+				funcPurviews, _ := service.FindAllFuncPurview(userRolePurviewsArr)
+				for _, item := range funcPurviews {
+					//for _, url := range strings.Split(item.Urlfor,","){
+					if strings.Split(item.Urlfor, ",")[0] == create_url {
+						is_has_create = true
+					}
+					if strings.Split(item.Urlfor, ",")[0] == modify_url {
+						is_has_modify = true
+					}
+					if strings.Split(item.Urlfor, ",")[0] == modify_other_url {
+						is_has_modify_other = true
+					}
+					if strings.Split(item.Urlfor, ",")[0] == del_url {
+						is_has_del = true
+					}
+					if strings.Split(item.Urlfor, ",")[0] == del_other_url {
+						is_has_del_other = true
+					}
+					if strings.Split(item.Urlfor, ",")[0] == exce_url {
+						is_has_exce = true
+					}
+					if strings.Split(item.Urlfor, ",")[0] == check_url {
+						is_has_check = true
+					}
+					if strings.Split(item.Urlfor, ",")[0] == modify_exce_url {
+						is_has_modify_exce = true
+					}
+
+				}
+			} else {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRole)
+				return
+			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"is_has_create":       is_has_create,
+				"is_has_modify":       is_has_modify,
+				"is_has_modify_other": is_has_modify_other,
+				"is_has_del":          is_has_del,
+				"is_has_del_other":    is_has_del_other,
+				"is_has_exce":         is_has_exce,
+				"is_has_check":        is_has_check,
+				"is_has_modify_exce":  is_has_modify_exce,
+				"module":              module,
+			})
+		} else {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdminUserIsExit)
+			return
+
+		}
+
+	} else {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"is_has_create":       true,
+			"is_has_modify":       true,
+			"is_has_modify_other": true,
+			"is_has_del":          true,
+			"is_has_del_other":    true,
+			"is_has_exce":         true,
+			"is_has_check":        true,
+			"is_has_modify_exce":  true,
+			"module":              true,
+		})
+
+	}
+
+}

controllers/new_mobile_api_controllers/role.json

@@ -18,7 +18,7 @@
       "is_system": 2,
       "number": 9998,
       "purview_ids": "49,71,72,70,74,75,73,127,128,48,52,110,93,121,122,124,125,120,101,100,102,156,157,158,159,15571,72,70,74,75,73,127,128,48,52,110,93,121,122,124,125,120,101,100,102,156,157,158,159,155",
-      "func_ids": "20001,20002,20004,20005,20007,20008,20010,20011,20012,20034,20035,20040,20041,20043,20044,20046,20047,20049,20024,20025,20026,20027,20028"
+      "func_ids": "20001,20002,20004,20005,20007,20008,20010,20011,20012,20034,20035,20040,20041,20043,20044,20046,20047,20049,20024,20025,20026,20027,20028,20030"
 
 
     },
@@ -30,7 +30,7 @@
       "is_system": 3,
       "number": 9997,
       "purview_ids": "49,74,75,73,48,52,110,93,121,122,124,125,120",
-      "func_ids": "20007,20008,20010,20011,20012,20055,20056,20013,20014,20016,20017,20019,20021,20022,20024,20025,20026,20027,20028"
+      "func_ids": "20007,20008,20010,20011,20012,20055,20056,20013,20014,20016,20017,20019,20021,20022,20024,20025,20026,20027,20028,20051,20052,20053"
     },
     {
       "role_name": "库存",

controllers/role.json

@@ -18,7 +18,7 @@
       "is_system": 2,
       "number": 9998,
       "purview_ids": "49,71,72,70,74,75,73,127,128,48,52,110,93,121,122,124,125,120,101,100,102,156,157,158,159,15571,72,70,74,75,73,127,128,48,52,110,93,121,122,124,125,120,101,100,102,156,157,158,159,155",
-      "func_ids": "20001,20002,20004,20005,20007,20008,20010,20011,20012,20034,20035,20040,20041,20043,20044,20046,20047,20049,20024,20025,20026,20027,20028"
+      "func_ids": "20001,20002,20004,20005,20007,20008,20010,20011,20012,20034,20035,20040,20041,20043,20044,20046,20047,20049,20024,20025,20026,20027,20028,20030"
 
 
     },
@@ -30,7 +30,7 @@
       "is_system": 3,
       "number": 9997,
       "purview_ids": "49,74,75,73,48,52,110,93,121,122,124,125,120",
-      "func_ids": "20007,20008,20010,20011,20012,20055,20056,20013,20014,20016,20017,20019,20021,20022,20024,20025,20026,20027,20028"
+      "func_ids": "20007,20008,20010,20011,20012,20055,20056,20013,20014,20016,20017,20019,20021,20022,20024,20025,20026,20027,20028,20051,20052,20053"
     }
   ]
 }

controllers/verify_login_controller.go

@@ -141,6 +141,10 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 				"address":        curOrg.Address,
 			}
 
+			var didRegistedForSCRM bool = false
+			var didRegistedForCDM bool = false
+			var didRegistedForMall bool = false
+
 			tempInfo, _ := service.GetOrgInfoTemplate(curOrg.Id)
 			fmt.Println("teimpInfo", tempInfo)
 			template_info := map[string]interface{}{
@@ -166,6 +170,10 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 			if len(curAppUrlfors) == 0 {
 				if adminUser.Id == curOrg.Creator { //超级管理员
 					urlfors, _, _ := service.GetSuperAdminUsersPurviewTreeAndUrlfors(3)
+					didRegistedForSCRM = true
+					didRegistedForCDM = true
+					didRegistedForMall = true
+
 					//urlfors, _, _ := service.GetSuperAdminUsersPurviewTreeAndUrlfors(4)
 					//urlfors, _, _ := service.GetSuperAdminUsersPurviewTreeAndUrlfors(5)
 					//urlfors, _, _ := service.GetSuperAdminUsersPurviewTreeAndUrlfors(6)
@@ -204,10 +212,6 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 				}
 			}
 
-			var didRegistedForSCRM bool = false
-			var didRegistedForCDM bool = false
-			var didRegistedForMall bool = false
-
 			for _, item := range pruviews {
 				if item.Module == 6 {
 					didRegistedForSCRM = true