Merge branch 'cygx_5.2' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/user.go

@@ -1143,7 +1143,7 @@ func (this *UserController) AlertIsShow() {
 		br.ErrMsg = "城市配置信息失败，Err:" + err.Error()
 		return
 	}
-	if user.CompanyId == 0 && detail.ConfigValue == "1" {
+	if user.CompanyId == 1 && detail.ConfigValue == "1" {
 		resp.IsShow = true
 	}
 	br.Ret = 200