diff --git a/conf/app.go b/conf/app.go index f77cab8..685f569 100644 --- a/conf/app.go +++ b/conf/app.go @@ -41,12 +41,12 @@ var AppConfig AppConf = AppConf{ TimeFormat: "Mon, 01 Jan 2006 15:04:05 GMT", Charset: "UTF-8", Other: Other{ - IgnoreURLs: []string{"/", "/user/login", "/user/plants", "/admin/tabnames/download", "/user/getimg", "/admin/api/screw/receive", "/admin/log/artdemandhead/selectlastmodify", "/admin/log/artdemandlst/synchronous", "/admin/log/artdemandlstcache/synchronouscache", "/admin/report/filterdatainfo/display", "/admin/ws"}, //免token验证路径 + IgnoreURLs: []string{"/", "/user/login", "/user/plants", "/admin/tabnames/download", "/user/getimg", "/admin/api/screw/receive", "/admin/log/artdemandhead/selectlastmodify", "/admin/log/artdemandlst/synchronous", "/admin/log/artdemandlstcache/synchronouscache", "/admin/report/filterdatainfo/display", "/admin/ws","/datal"}, //免token验证路径 JWTTimeout: 72000, LogLevel: "debug", Secret: "lapp_gaas_gframe", }, - PublicRute: []string{"/sysMenu", "/user/getuserinfo", "/user/pwd", "/user/avatar", "/user/profile", "/user/getimg", "/admin/tabnames/list", "/admin/stdeftab/selectarr", "/admin/stdeftab/selectall", "/admin/log/artdemandhead/selectlastmodify", "/admin/log/artdemandlst/synchronous", "/admin/log/artdemandlstcache/synchronouscache"}, //免权限检查路径 + PublicRute: []string{"/sysMenu", "/user/getuserinfo", "/user/pwd", "/user/avatar", "/user/profile", "/user/getimg", "/admin/tabnames/list", "/admin/stdeftab/selectarr", "/admin/stdeftab/selectall", "/admin/log/artdemandhead/selectlastmodify", "/admin/log/artdemandlst/synchronous", "/admin/log/artdemandlstcache/synchronouscache","/datal"}, //免权限检查路径 } var ( diff --git a/services/log/implments/PackOrder.service.impl.go b/services/log/implments/PackOrder.service.impl.go index a10201d..238efcc 100644 --- a/services/log/implments/PackOrder.service.impl.go +++ b/services/log/implments/PackOrder.service.impl.go @@ -728,8 +728,11 @@ func (self *PackOrderServiceImplement) IsCreatePackOrder(user *models.Usertab, o if err != nil { return nil, grmi.NewBusinessError("序列订单查询错误!") } - if OrderInfo == nil || OrderInfo.Status != bmodel.CHECK_STATUS_CLOSED { - return nil, grmi.NewBusinessError("该序列订单已经检测!") + if OrderInfo == nil{ + return nil, grmi.NewBusinessError("该序列订单没有检测!") + } + if OrderInfo.Status != bmodel.CHECK_STATUS_CLOSED { + return nil, grmi.NewBusinessError("该序列订单检测不合格!") } } else if mesData.LINE == "G-Frame Assy" { //校验 @@ -1220,8 +1223,11 @@ func (self *PackOrderServiceImplement) CheckPackOrderItem(user *models.Usertab, if err != nil { return "", grmi.NewBusinessError("序列订单查询错误!") } - if OrderInfo == nil || OrderInfo.Status != bmodel.CHECK_STATUS_CLOSED { - return "", grmi.NewBusinessError("该序列订单已经检测!") + if OrderInfo == nil { + return "", grmi.NewBusinessError("该序列订单没有检测!") + } + if OrderInfo.Status != bmodel.CHECK_STATUS_CLOSED { + return "", grmi.NewBusinessError("该序列订单检测不合格!") } } else if mesData.LINE == "G-Frame Assy" { //校验