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

controllers/new_mobile_api_controllers/mobile_regist_controller.go

@@ -242,6 +242,7 @@ func (this *MobileRegistController) CreateOrg() {
 		//初始化设备管理org
 		InitEquitMentInformation(org)
 		//初始化显示配置
+		InitShowConfig(org)
 
 		//创建完机构后进行登录验证操作
 		ip := utils.GetIP(this.Ctx.Request)
@@ -1172,3 +1173,7 @@ func InitEquitMentInformation(org *models.Org) {
 	}
 	service.CreatedTreateMode(&treatmentmodefive)
 }
+
+func InitShowConfig(org *models.Org) {
+	service.BatchInsertFiledSystemConfig(org.Id)
+}

service/data.go

@@ -185,3 +185,8 @@ func FindSysDialysisFiledByOrgId() (filedConfig []*models.FiledConfig, err error
 	err = readDb.Model(&models.FiledConfig{}).Where("org_id =? AND id in (11250,11251,11252,11253,11254,11255,11256,11257,11258,11259,11260,11261,11262)", 0).Find(&filedConfig).Error
 	return
 }
+
+func BatchInsertFiledSystemConfig(org_id int64) (err error) {
+	err = readDb.Exec("INSERT  INTO sgj_xt.xt_filed_config  ( org_id,  module,  filed_name,  filed_name_cn,  is_show ) SELECT ?,  module,  filed_name,  filed_name_cn,  is_show FROM sgj_xt.xt_filed_config  WHERE org_id = 9442  AND sys_module = 2", org_id).Error
+	return
+}