From 6dbae525672c01733cb7563ddc690f4ccaaafa41 Mon Sep 17 00:00:00 2001 From: yehongyang Date: Mon, 27 Dec 2021 21:40:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=91=E8=9D=B6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dao/base/implments/User.dao.impl.go | 2 +- .../base/implments/Article.service.impl.go | 2 +- services/base/implments/User.service.impl.go | 35 ++++++++++--------- utils/k3cloud/base/curl.go | 7 ++-- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dao/base/implments/User.dao.impl.go b/dao/base/implments/User.dao.impl.go index b5ed590..e329505 100644 --- a/dao/base/implments/User.dao.impl.go +++ b/dao/base/implments/User.dao.impl.go @@ -107,7 +107,7 @@ func (impl *UserDAOImplement) UpdateOne(entity *model.User) error { entity.PlantNr = impl.plantNr entity.LastUser = impl.userid - _, err := impl.session.Table(impl.meta.TableName).Cols("PlantNr,RoleId,Role,NickName,Name,Status,Gender,UserId,Email,Phone").ID(entity.GetKey()).Update(entity) + _, err := impl.session.Table(impl.meta.TableName).Cols("PlantNr,RoleId,Role,NickName,Name,Status,Gender,UserId,Email,Phone,CustCommissioner").ID(entity.GetKey()).Update(entity) if err != nil { return grmi.NewDataBaseError(err) } diff --git a/services/base/implments/Article.service.impl.go b/services/base/implments/Article.service.impl.go index 96cf401..4129acd 100644 --- a/services/base/implments/Article.service.impl.go +++ b/services/base/implments/Article.service.impl.go @@ -308,7 +308,7 @@ func (impl *ArticleServiceImplement) ImportArticle(_list [][]interface{}, taskVa }) } } else { - attrVal = _info[0].AttrCode + attrVal = "" } } } diff --git a/services/base/implments/User.service.impl.go b/services/base/implments/User.service.impl.go index c4150af..f9183e9 100644 --- a/services/base/implments/User.service.impl.go +++ b/services/base/implments/User.service.impl.go @@ -25,23 +25,24 @@ import ( ******************************************************************************/ var DefaultConditionOfUser = grmi.NewCondition( map[string]grmi.ConditionItem{ - meta.User_UserId.UrlParameterName: grmi.NewConditionItem(meta.User_UserId, grmi.Equal, true), - meta.User_Name.UrlParameterName: grmi.NewConditionItem(meta.User_Name, grmi.Equal, false), - meta.User_NickName.UrlParameterName: grmi.NewConditionItem(meta.User_NickName, grmi.Equal, false), - meta.User_DepId.UrlParameterName: grmi.NewConditionItem(meta.User_DepId, grmi.Equal, false), - meta.User_Phone.UrlParameterName: grmi.NewConditionItem(meta.User_Phone, grmi.Equal, false), - meta.User_Avatar.UrlParameterName: grmi.NewConditionItem(meta.User_Avatar, grmi.Equal, false), - meta.User_Email.UrlParameterName: grmi.NewConditionItem(meta.User_Email, grmi.Equal, false), - meta.User_Status.UrlParameterName: grmi.NewConditionItem(meta.User_Status, grmi.Equal, false), - meta.User_Gender.UrlParameterName: grmi.NewConditionItem(meta.User_Gender, grmi.Equal, false), - meta.User_Position.UrlParameterName: grmi.NewConditionItem(meta.User_Position, grmi.Equal, false), - meta.User_Role.UrlParameterName: grmi.NewConditionItem(meta.User_Role, grmi.Equal, false), - meta.User_Remark.UrlParameterName: grmi.NewConditionItem(meta.User_Remark, grmi.Equal, false), - meta.User_Password.UrlParameterName: grmi.NewConditionItem(meta.User_Password, grmi.Equal, false), - meta.User_RoleId.UrlParameterName: grmi.NewConditionItem(meta.User_RoleId, grmi.Equal, false), - meta.User_LastModify.UrlParameterName: grmi.NewConditionItem(meta.User_LastModify, grmi.Approximate, false), - meta.User_LastUser.UrlParameterName: grmi.NewConditionItem(meta.User_LastUser, grmi.Equal, false), - meta.User_CreateTime.UrlParameterName: grmi.NewConditionItem(meta.User_CreateTime, grmi.Approximate, false), + meta.User_UserId.UrlParameterName: grmi.NewConditionItem(meta.User_UserId, grmi.Equal, true), + meta.User_Name.UrlParameterName: grmi.NewConditionItem(meta.User_Name, grmi.Equal, false), + meta.User_NickName.UrlParameterName: grmi.NewConditionItem(meta.User_NickName, grmi.Equal, false), + meta.User_DepId.UrlParameterName: grmi.NewConditionItem(meta.User_DepId, grmi.Equal, false), + meta.User_Phone.UrlParameterName: grmi.NewConditionItem(meta.User_Phone, grmi.Equal, false), + meta.User_Avatar.UrlParameterName: grmi.NewConditionItem(meta.User_Avatar, grmi.Equal, false), + meta.User_Email.UrlParameterName: grmi.NewConditionItem(meta.User_Email, grmi.Equal, false), + meta.User_Status.UrlParameterName: grmi.NewConditionItem(meta.User_Status, grmi.Equal, false), + meta.User_Gender.UrlParameterName: grmi.NewConditionItem(meta.User_Gender, grmi.Equal, false), + meta.User_Position.UrlParameterName: grmi.NewConditionItem(meta.User_Position, grmi.Equal, false), + meta.User_Role.UrlParameterName: grmi.NewConditionItem(meta.User_Role, grmi.Equal, false), + meta.User_Remark.UrlParameterName: grmi.NewConditionItem(meta.User_Remark, grmi.Equal, false), + meta.User_Password.UrlParameterName: grmi.NewConditionItem(meta.User_Password, grmi.Equal, false), + meta.User_RoleId.UrlParameterName: grmi.NewConditionItem(meta.User_RoleId, grmi.Equal, false), + meta.User_LastModify.UrlParameterName: grmi.NewConditionItem(meta.User_LastModify, grmi.Approximate, false), + meta.User_LastUser.UrlParameterName: grmi.NewConditionItem(meta.User_LastUser, grmi.Equal, false), + meta.User_CreateTime.UrlParameterName: grmi.NewConditionItem(meta.User_CreateTime, grmi.Approximate, false), + meta.User_CustCommissioner.UrlParameterName: grmi.NewConditionItem(meta.User_CustCommissioner, grmi.Equal, false), }, nil, ) diff --git a/utils/k3cloud/base/curl.go b/utils/k3cloud/base/curl.go index 634cebf..f10d6b2 100644 --- a/utils/k3cloud/base/curl.go +++ b/utils/k3cloud/base/curl.go @@ -107,9 +107,10 @@ func (self *Browser) PostJson(requestUrl string, params map[string]interface{}) result := string(data) fmt.Println(result) is := strings.Contains(result, "\"ErrorCode\":500,\"") - if is{ - innerLog, _ := logger.NewLogger("system","erp_post_response") - innerLog.Debug("erp报错:",result) + if is { + innerLog, _ := logger.NewLogger("system", "erp_post_response") + innerLog.Debug("erp报错请求:", postData) + innerLog.Debug("erp报错:", result) return nil, err } return data, err