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

conf/app.conf

@@ -148,29 +148,25 @@ readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 readmysqluser = root
 readmysqlpass = 1Q2W3e4r!@#$
-//readmysqlname = test_xt
-readmysqlname = sgj_xt
+readmysqlname = test_xt
 
 writemysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 writemysqlport = 3306
 writemysqluser = root
 writemysqlpass = 1Q2W3e4r!@#$
-//writemysqlname = test_xt
-writemysqlname = sgj_xt
+writemysqlname = test_xt
 
 readuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readuserport = 3306
 readuseruser = root
 readuserpass = 1Q2W3e4r!@#$
-//readusername = test_users
-readusername = sgj_users
+readusername = test_users
 
 writeuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 writeuserport = 3306
 writeuseruser = root
 writeuserpass = 1Q2W3e4r!@#$
-//writeusername = test_users
-writeusername = sgj_users
+writeusername = test_users
 
 
 readmiddlehost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com

controllers/gobal_config_api_controller.go

@@ -160,89 +160,88 @@ func (c *GobalConfigApiController) PostPrintTemplate() {
 	return
 }
 
-//func (c *GobalConfigApiController) PostPrintTemplate() {
-//	template_id, _ := c.GetInt64("template_id", 0)
-//	adminUserInfo := c.GetAdminUserInfo()
-//	org_id := adminUserInfo.CurrentOrgId
-//	template := models.GobalTemplate{
-//		OrgId:      org_id,
-//		TemplateId: template_id,
-//		Status:     1,
-//		Ctime:      time.Now().Unix(),
-//		Mtime:      time.Now().Unix(),
-//	}
-//
-//	errs, templates := service.FindPrintTemplateByOrgId(org_id)
-//
-//	if errs == gorm.ErrRecordNotFound {
-//		err := service.CreatePrintTemplateRecord(&template)
-//		if err != nil {
-//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
-//			return
-//		}
-//
-//		//if err == nil { //处理模版切换，显示配置处理逻辑
-//		//	//service.FindAllConfig
-//		//	//先将所有数据设置为显示
-//		//	updateErr := service.UpdateFiledConfig(adminUserInfo.CurrentOrgId)
-//		//	if updateErr == nil {
-//		//		//查出该模版对应显示配置字段中所有隐藏的字段
-//				_, config := service.FindAllHideFiledConfig(template_id)
-//		//
-//		//		var fileds []string
-//		//		for _, item := range config {
-//		//			fileds = append(fileds, item.FiledName)
-//		//		}
-//		//		service.UpdateShowFieldConfig(adminUserInfo.CurrentOrgId, fileds)
-//		//	}
-//		//
-//		//}
-//		//FiledList, _ := service.FindFiledByOrgId(adminUserInfo.CurrentOrgId)
-//		c.ServeSuccessJSON(map[string]interface{}{
-//			"template_id": template_id,
-//			//"fileds":      FiledList,
-//		})
-//
-//	} else if errs == nil {
-//		templates := models.GobalTemplate{
-//			ID:         templates.ID,
-//			OrgId:      org_id,
-//			TemplateId: template_id,
-//			Status:     1,
-//			Ctime:      templates.Ctime,
-//			Mtime:      time.Now().Unix(),
-//		}
-//
-//		err := service.UpdatePrintTemplate(&templates)
-//		if err != nil {
-//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
-//			return
-//		}
-//
-//		if err == nil { //处理模版切换，显示配置处理逻辑
-//			//service.FindAllConfig
-//			//先将所有数据设置为显示
-//			updateErr := service.UpdateFiledConfig(adminUserInfo.CurrentOrgId)
-//			if updateErr == nil {
-//				//查出该模版对应显示配置字段中所有隐藏的字段
-//				_, config := service.FindAllHideFiledConfig(template_id)
-//				var fileds []string
-//				for _, item := range config {
-//					fileds = append(fileds, item.FiledName)
-//				}
-//				service.UpdateShowFieldConfig(adminUserInfo.CurrentOrgId, fileds)
-//
-//			}
-//
-//		}
-//		FiledList, _ := service.FindFiledByOrgId(adminUserInfo.CurrentOrgId)
-//		c.ServeSuccessJSON(map[string]interface{}{
-//			"template_id": template_id,
-//			"fileds":      FiledList,
-//		})
-//		return
-//	}
-//}
+func (c *GobalConfigApiController) PostPrintTemplateTwo() {
+	template_id, _ := c.GetInt64("template_id", 0)
+	adminUserInfo := c.GetAdminUserInfo()
+	org_id := adminUserInfo.CurrentOrgId
+	template := models.GobalTemplate{
+		OrgId:      org_id,
+		TemplateId: template_id,
+		Status:     1,
+		Ctime:      time.Now().Unix(),
+		Mtime:      time.Now().Unix(),
+	}
+
+	errs, templates := service.FindPrintTemplateByOrgId(org_id)
+
+	if errs == gorm.ErrRecordNotFound {
+		err := service.CreatePrintTemplateRecord(&template)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+			return
+		}
+
+		if err == nil { //处理模版切换，显示配置处理逻辑
+			//service.FindAllConfig
+			//先将所有数据设置为显示
+			updateErr := service.UpdateFiledConfig(adminUserInfo.CurrentOrgId)
+			if updateErr == nil {
+				//查出该模版对应显示配置字段中所有隐藏的字段
+				_, config := service.FindAllHideFiledConfig(template_id)
+
+				var fileds []string
+				for _, item := range config {
+					fileds = append(fileds, item.FiledName)
+				}
+				service.UpdateShowFieldConfig(adminUserInfo.CurrentOrgId, fileds)
+			}
+		}
+		FiledList, _ := service.FindFiledByOrgId(adminUserInfo.CurrentOrgId)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"template_id": template_id,
+			"fileds":      FiledList,
+		})
+
+	} else if errs == nil {
+		templates := models.GobalTemplate{
+			ID:         templates.ID,
+			OrgId:      org_id,
+			TemplateId: template_id,
+			Status:     1,
+			Ctime:      templates.Ctime,
+			Mtime:      time.Now().Unix(),
+		}
+
+		err := service.UpdatePrintTemplate(&templates)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+			return
+		}
+
+		if err == nil { //处理模版切换，显示配置处理逻辑
+			//service.FindAllConfig
+			//先将所有数据设置为显示
+			updateErr := service.UpdateFiledConfig(adminUserInfo.CurrentOrgId)
+			if updateErr == nil {
+				//查出该模版对应显示配置字段中所有隐藏的字段
+				_, config := service.FindAllHideFiledConfig(template_id)
+				var fileds []string
+				for _, item := range config {
+					fileds = append(fileds, item.FiledName)
+				}
+				service.UpdateShowFieldConfig(adminUserInfo.CurrentOrgId, fileds)
+
+			}
+
+		}
+		FiledList, _ := service.FindFiledByOrgId(adminUserInfo.CurrentOrgId)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"template_id": template_id,
+			"fileds":      FiledList,
+		})
+		return
+	}
+}
 
 func (c *GobalConfigApiController) GetPrintTemplate() {
 	adminUserInfo := c.GetAdminUserInfo()
@@ -1015,7 +1014,12 @@ func (this *GobalConfigApiController) ChangeOrg() {
 			}
 		}
 
+		var didRegistedForSCRM bool = false
+		var didRegistedForCDM bool = false
+		var didRegistedForMall bool = false
+
 		var curAppUrlfors []string
+		var pruviews []*models.Purview
 
 		if len(curAppUrlfors) == 0 {
 			if adminUser.Id == tempOrg.Creator {
@@ -1027,30 +1031,56 @@ func (this *GobalConfigApiController) ChangeOrg() {
 				curAppUrlfors = append(curAppUrlfors, urlfors_scrm...)
 				curAppUrlfors = append(curAppUrlfors, urlfors_cdm...)
 				curAppUrlfors = append(curAppUrlfors, urlfors_mall...)
+
+				didRegistedForSCRM = true
+				didRegistedForCDM = true
+				didRegistedForMall = true
+
 			} else {
 				appRole, _ := service.FindAdminUserIDA(appRole.Id)
-				role_arr := strings.Split(appRole.RoleIds, ",")
-				var ids string
-				for _, role_id := range role_arr {
-					id, _ := strconv.ParseInt(role_id, 10, 64)
-					purview_ids, _ := service.GetRolePurviewIds(id)
-					if len(ids) == 0 {
-						ids = purview_ids
-					} else {
-						ids = ids + "," + purview_ids
+				if appRole.Id > 0 && len(appRole.RoleIds) > 0 {
+					role_arr := strings.Split(appRole.RoleIds, ",")
+					var ids string
+					for _, role_id := range role_arr {
+						id, _ := strconv.ParseInt(role_id, 10, 64)
+						purview_ids, _ := service.GetRolePurviewIds(id)
+						if len(ids) == 0 {
+							ids = purview_ids
+						} else {
+							ids = ids + "," + purview_ids
+						}
 					}
-				}
+					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 {
 
-				pruviews, _ := service.GetPurviewById(ids)
-				for _, item := range pruviews {
-					if item.Module == 3 && item.Parentid > 0 {
-						fmt.Println(item.Urlfor)
-						curAppUrlfors = append(curAppUrlfors, item.Urlfor)
+						curAppUrlfors = append(curAppUrlfors, "")
 					}
+				} else {
+					curAppUrlfors = append(curAppUrlfors, "")
+
 				}
 			}
 		}
 
+		for _, item := range pruviews {
+			if item.Module == 6 {
+				didRegistedForSCRM = true
+			}
+			if item.Module == 4 {
+				didRegistedForCDM = true
+			}
+			if item.Module == 7 {
+				didRegistedForMall = true
+			}
+		}
+
 		userInfo := map[string]interface{}{
 			"id":         adminUser.Id,
 			"mobile":     adminUser.Mobile,
@@ -1099,14 +1129,17 @@ func (this *GobalConfigApiController) ChangeOrg() {
 		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,
-			"template_info":  template_info,
-			"fileds":         FiledList,
+			"user":            userInfo,
+			"org":             org,
+			"urlfors":         curAppUrlfors,
+			"current_org_id":  adminUserInfo.CurrentOrgId,
+			"current_app_id":  adminUserInfo.CurrentAppId,
+			"subscibe":        subscibe,
+			"template_info":   template_info,
+			"fileds":          FiledList,
+			"scrm_role_exist": didRegistedForSCRM,
+			"cdm_role_exist":  didRegistedForCDM,
+			"mall_role_exist": didRegistedForMall,
 		})
 
 	}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2248,6 +2248,8 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 
 		prescription.CreatedTime = dialysisPrescription.CreatedTime
 		prescription.Modifier = adminUserInfo.AdminUser.Id
+		prescription.Creater = dialysisPrescription.Creater
+
 		prescription.PrescriptionDoctor = adminUserInfo.AdminUser.Id
 		prescription.ID = dialysisPrescription.ID
 		err := service.UpDateDialysisPrescription(&prescription)

controllers/new_mobile_api_controllers/role.json

@@ -7,8 +7,8 @@
       "status": 1,
       "is_system": 1,
       "number": 9999,
-      "purview_ids": "49,71,72,70,74,75,73,127,128,48,52,110,94,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,77,78,79,80,76,156,157,158,159,155,82,83,108,149,154,190,81,101,100,102,161,160,162,163,165,170,169,171,172,173,174,177,175,178,180,179,181,186,185,187,188,189,192,81,82,83,104,106,107,108,149,154,190,191",
-      "func_ids": "20001,20002,20003,20004,20005,20006,20007,20008,20010,20011,20012,20024,20025,20026,20027,20028,20030,20034,20035,20036,20038,20039,20040,20041,20042,20043,20044,20045,20046,20047,20048,20049,20050,20054"
+      "purview_ids": "71,72,70,74,75,73,48,52,110,49,77,78,79,80,197,76,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,127,128,201,193,194,196,192,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,101,100,102",
+      "func_ids": "20001,20002,20003,20004,20005,20006,20007,20008,20009,20010,20011,20012,20034,20035,20036,20038,20039,20055,20056,20040,20041,20042,20043,20054,20044,20045,20046,20047,20048,20049,20050,20051,20052,20053,20013,20014,20015,20016,20017,20018,20019,20020,20021,20022,20023,20024,20025,20026,20027,20028,20029,20030"
     },
     {
       "role_name": "医生",
@@ -17,8 +17,8 @@
       "status": 1,
       "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,20030"
+      "purview_ids": "71,72,70,74,75,73,48,52,110,77,78,79,80,197,76,93,121,122,124,125,120,127,128,193,194,196,192,101,100,102,49",
+      "func_ids": "20001,20002,20003,20004,20005,20006,20007,20008,20009,20010,20011,20012,20034,20035,20036,20038,20040,20041,20043,20044,20046,20047,20049,20024,20025,20026,20027,20028,20029,20030"
 
 
     },
@@ -29,8 +29,8 @@
       "status": 1,
       "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,20051,20052,20053"
+      "purview_ids": "71,72,70,74,75,73,127,128,48,49,52,110,111,112,113,114,115,116,117,118,119,129,84,77,78,79,80,197,76",
+      "func_ids": "20007,20008,20009,20010,20011,20051,20053,20013,20014,20016,20017,20019,20021,20022,20024,20025,20026,20027,20028,20029"
     },
     {
       "role_name": "库存",
@@ -39,7 +39,7 @@
       "status": 1,
       "is_system": 0,
       "number": 9996,
-      "purview_ids": "94,111,112,113,114,115,116,117,118,119,129,84",
+      "purview_ids": "111,112,113,114,115,116,117,118,119,129,84",
       "func_ids": ""
 
 
@@ -51,7 +51,7 @@
       "status": 1,
       "is_system": 0,
       "number": 9995,
-      "purview_ids": "161,160,162,163,165,170,169,171,172,173,174,177,175,178,180,179,181,186,185,187,188,189,192",
+      "purview_ids": "48,110,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,201",
       "func_ids": ""
 
 
@@ -63,7 +63,7 @@
       "status": 1,
       "is_system": 0,
       "number": 9994,
-      "purview_ids": "77,78,79,80,76,191",
+      "purview_ids": "77,78,79,80,197,76",
       "func_ids": ""
 
 
@@ -75,7 +75,7 @@
       "status": 1,
       "is_system": 0,
       "number": 9993,
-      "purview_ids": "49,71,72,70,74,75,73,127,128,48,52,110,94,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,77,78,79,80,76,156,157,158,159,155,82,83,108,149,154,190,81,101,100,102,161,160,162,163,165,170,169,171,172,173,174,177,175,178,180,179,181,186,185,187,188,189,192",
+      "purview_ids": "71,72,70,74,75,73,48,52,110,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,77,78,79,80,197,76,101,100,102,127,128,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,201",
       "func_ids": ""
 
 

controllers/role.json

@@ -7,8 +7,8 @@
       "status": 1,
       "is_system": 1,
       "number": 9999,
-      "purview_ids": "49,71,72,70,74,75,73,127,128,48,52,110,94,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,77,78,79,80,76,156,157,158,159,155,82,83,108,149,154,190,81,101,100,102,161,160,162,163,165,170,169,171,172,173,174,177,175,178,180,179,181,186,185,187,188,189,192,81,82,83,104,106,107,108,149,154,190,191",
-      "func_ids": "20001,20002,20003,20004,20005,20006,20007,20008,20010,20011,20012,20024,20025,20026,20027,20028,20030,20034,20035,20036,20038,20039,20040,20041,20042,20043,20044,20045,20046,20047,20048,20049,20050,20054"
+      "purview_ids": "71,72,70,74,75,73,48,52,110,49,77,78,79,80,197,76,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,127,128,201,193,194,196,192,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,101,100,102",
+      "func_ids": "20001,20002,20003,20004,20005,20006,20007,20008,20009,20010,20011,20012,20034,20035,20036,20038,20039,20055,20056,20040,20041,20042,20043,20054,20044,20045,20046,20047,20048,20049,20050,20051,20052,20053,20013,20014,20015,20016,20017,20018,20019,20020,20021,20022,20023,20024,20025,20026,20027,20028,20029,20030"
     },
     {
       "role_name": "医生",
@@ -17,8 +17,8 @@
       "status": 1,
       "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,20030"
+      "purview_ids": "71,72,70,74,75,73,48,52,110,77,78,79,80,197,76,93,121,122,124,125,120,127,128,193,194,196,192,101,100,102,49",
+      "func_ids": "20001,20002,20003,20004,20005,20006,20007,20008,20009,20010,20011,20012,20034,20035,20036,20038,20040,20041,20043,20044,20046,20047,20049,20024,20025,20026,20027,20028,20029,20030"
 
 
     },
@@ -29,8 +29,8 @@
       "status": 1,
       "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,20051,20052,20053"
+      "purview_ids": "71,72,70,74,75,73,127,128,48,49,52,110,111,112,113,114,115,116,117,118,119,129,84,77,78,79,80,197,76",
+      "func_ids": "20007,20008,20009,20010,20011,20051,20053,20013,20014,20016,20017,20019,20021,20022,20024,20025,20026,20027,20028,20029"
     }
   ]
 }

controllers/verify_login_controller.go

@@ -224,6 +224,13 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 				}
 			}
 
+			if adminUser.Id == curOrg.Creator { //超级管理员
+				didRegistedForSCRM = true
+				didRegistedForCDM = true
+				didRegistedForMall = true
+
+			}
+
 			subscibe, _ := service.GetOrgSubscibe(adminUserInfo.CurrentOrgId)
 
 			this.SetSession("admin_user_info", adminUserInfo)

service/orginfo_service.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"XT_New/models"
+	"fmt"
 	"github.com/jinzhu/gorm"
 	"strconv"
 	"time"
@@ -124,6 +125,7 @@ func createOrgApp(tx *gorm.DB, superAdminRole *models.Role, userName string, app
 			app_id = app.ID
 
 		}
+		fmt.Println(item.VMOrgApp)
 
 		for _, subItem := range item.VMOrgApp {
 			app := &VMOrgApp{