diff --git a/dsDataex/MyReport/ESSql/ESSqlOpenapi/ESSqlOpenapi.go b/dsDataex/MyReport/ESSql/ESSqlOpenapi/ESSqlOpenapi.go index 7cda6b16..799c061c 100644 --- a/dsDataex/MyReport/ESSql/ESSqlOpenapi/ESSqlOpenapi.go +++ b/dsDataex/MyReport/ESSql/ESSqlOpenapi/ESSqlOpenapi.go @@ -21,12 +21,12 @@ func QuerySimple(c *gin.Context) { var input MySwagger.QuerySimple if err := c.ShouldBindJSON(&input); err != nil { - c.JSON(http.StatusBadRequest, MySwagger.DataResult{Success: false,Message: "简单查询数据JSON格式错误"}) + c.JSON(http.StatusOK, MySwagger.DataResult{Success: false,Message: "简单查询数据JSON格式错误"}) return } if input.Query.QueryID==""{ - c.JSON(http.StatusBadRequest, MySwagger.DataResult{Success: false,Message: "简单查询数据QueryID不能为空"}) + c.JSON(http.StatusOK, MySwagger.DataResult{Success: false,Message: "简单查询数据QueryID不能为空"}) return } diff --git a/dsDataex/MyReport/ESSql/ESSqlService/ESSqlService.go b/dsDataex/MyReport/ESSql/ESSqlService/ESSqlService.go index 7bba0fca..560e602c 100644 --- a/dsDataex/MyReport/ESSql/ESSqlService/ESSqlService.go +++ b/dsDataex/MyReport/ESSql/ESSqlService/ESSqlService.go @@ -901,10 +901,12 @@ func JoinESTable(result ES7SqlUtil.ESSqlResult, result2 ES7SqlUtil.ESSqlResult, **/ func GetUser4Kafka(userID string,userIdentity string) (bool,[]map[string]interface{}){ - //1 教师,2 学生,3 家长,4 管理员,5 访客 + //change by zhangjun 2020-08-05 + //不按照身份绑定分类,在数据库中自定义查询解耦各个版本基础数据的身份不同问题。 + //1 教师,2 学生,3 家长,4 管理员,5 访客--不适用!!! switch userIdentity { case "1": - res,_,data,_ := ESSqlDAO.GetQuerybyCode("kafka_teacher") + res,_,data,_ := ESSqlDAO.GetQuerybyCode("kafka_user_1") if res { @@ -919,7 +921,7 @@ func GetUser4Kafka(userID string,userIdentity string) (bool,[]map[string]interfa } break case "2": - res,_,data,_ := ESSqlDAO.GetQuerybyCode("kafka_student") + res,_,data,_ := ESSqlDAO.GetQuerybyCode("kafka_user_2") if res { @@ -934,7 +936,7 @@ func GetUser4Kafka(userID string,userIdentity string) (bool,[]map[string]interfa } break case "3": - res,_,data,_ := ESSqlDAO.GetQuerybyCode("kafka_parent") + res,_,data,_ := ESSqlDAO.GetQuerybyCode("kafka_user_3") if res { @@ -949,7 +951,7 @@ func GetUser4Kafka(userID string,userIdentity string) (bool,[]map[string]interfa } break case "4": - res,_,data,_ := ESSqlDAO.GetQuerybyCode("kafka_admin") + res,_,data,_ := ESSqlDAO.GetQuerybyCode("kafka_user_4") if res { @@ -964,7 +966,7 @@ func GetUser4Kafka(userID string,userIdentity string) (bool,[]map[string]interfa } break case "5": - res,_,data,_ := ESSqlDAO.GetQuerybyCode("kafka_guest") + res,_,data,_ := ESSqlDAO.GetQuerybyCode("kafka_user_5") if res {