diff --git a/modules/sys/api_activate.go b/modules/sys/api_activate.go index 40bed01b6..bad8a3141 100644 --- a/modules/sys/api_activate.go +++ b/modules/sys/api_activate.go @@ -17,7 +17,10 @@ func (this *apiComp) FuncActivate(session comm.IUserSession, req *pb.SysFuncActi opencfg := this.module.configure.getOpencondCfgByCid(req.Cid) if opencfg != nil { if id := this.module.modelSys.validCond(session.GetUserId(), opencfg); id == "" { // 条件不满足 - code = pb.ErrorCode_OpenCondErr + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_OpenCondErr, + Title: pb.ErrorCode_OpenCondErr.ToString(), + } return } } @@ -25,7 +28,10 @@ func (this *apiComp) FuncActivate(session comm.IUserSession, req *pb.SysFuncActi list, _ := this.module.modelSys.GetOpenCondList(session.GetUserId()) for k, v := range list.Cond { if k == req.Cid && v != 0 { - code = pb.ErrorCode_OpenCondActivate + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_OpenCondActivate, + Title: pb.ErrorCode_OpenCondActivate.ToString(), + } return } } @@ -35,7 +41,11 @@ func (this *apiComp) FuncActivate(session comm.IUserSession, req *pb.SysFuncActi }) rsp.Cid = req.Cid if err := session.SendMsg(string(this.module.GetType()), "funcactivate", rsp); err != nil { - code = pb.ErrorCode_SystemError + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_SystemError, + Title: pb.ErrorCode_SystemError.ToString(), + } + return } //手动激活通知模块 diff --git a/modules/sys/api_getlist.go b/modules/sys/api_getlist.go index 2b91eb2ab..a639d3c04 100644 --- a/modules/sys/api_getlist.go +++ b/modules/sys/api_getlist.go @@ -54,8 +54,6 @@ func (this *apiComp) FuncGetList(session comm.IUserSession, req *pb.SysFuncGetLi } } - if err := session.SendMsg(string(this.module.GetType()), "funcgetlist", rsp); err != nil { - code = pb.ErrorCode_SystemError - } + session.SendMsg(string(this.module.GetType()), "funcgetlist", rsp) return }