|
|
@@ -1,11 +1,12 @@
|
|
|
package register
|
|
|
|
|
|
import (
|
|
|
- "dashoo.cn/business2/parameter"
|
|
|
"encoding/json"
|
|
|
"strconv"
|
|
|
"time"
|
|
|
|
|
|
+ "dashoo.cn/business2/parameter"
|
|
|
+
|
|
|
"dashoo.cn/backend/api/business/auditsetting"
|
|
|
"dashoo.cn/backend/api/business/baseUser"
|
|
|
"dashoo.cn/backend/api/business/oilsupplier/supplier"
|
|
|
@@ -112,7 +113,6 @@ func (this *OilCorporateInfoController) AddEntity() {
|
|
|
json.Unmarshal(jsonBlob, &model)
|
|
|
|
|
|
model.CreateOn = time.Now()
|
|
|
- // model.CheckUserId = 284
|
|
|
|
|
|
svc := register.GetOilCorporateInfoService(utils.DBE)
|
|
|
_, err2 := svc.InsertEntityBytbl("OilCorporateInfo", &model)
|
|
|
@@ -176,14 +176,14 @@ func (this *OilCorporateInfoController) AddUser() {
|
|
|
userentity.Username = model.UserName
|
|
|
userentity.Realname = model.UserRealName
|
|
|
userentity.Telephone = model.UserTelephone
|
|
|
- userentity.Roleid,_ = strconv.Atoi(roleid)//企业用户
|
|
|
- userentity.Companyid = "0"
|
|
|
+ userentity.Roleid, _ = strconv.Atoi(roleid) //企业用户
|
|
|
+ // userentity.Companyid = "0"
|
|
|
userentity.IsCompanyUser = 1
|
|
|
- userentity.Departmentid = "100000171"
|
|
|
- userentity.Departmentname = "供方企业"
|
|
|
+ // userentity.Departmentid = "100000171"
|
|
|
+ // userentity.Departmentname = "供方企业"
|
|
|
userentity.Createon = time.Now()
|
|
|
// userentity.CreateBy = this.User.Realname
|
|
|
- userentity.Createuserid = 284
|
|
|
+ // userentity.Createuserid = 284
|
|
|
|
|
|
//处理密码
|
|
|
pwd, key, errrk := utils.TripleDesEncrypt(model.UserPass)
|
|
|
@@ -214,11 +214,11 @@ func (this *OilCorporateInfoController) AddUser() {
|
|
|
model.CreateBy = userentity.Realname
|
|
|
model.CreateUserId = userentity.Id
|
|
|
svcRegister := register.GetOilCorporateInfoService(utils.DBE)
|
|
|
- //删除
|
|
|
+ //删除原有数据(由于采用 svcRegister.UpdateEntityById() 一直报错,所以采用先删除再添加的方式达到更新数据的目的!)
|
|
|
where := " Id = " + strconv.Itoa(model.Id)
|
|
|
err2 := svcRegister.DeleteEntityBytbl("OilCorporateInfo", where)
|
|
|
if err2 == nil {
|
|
|
- //插入数据
|
|
|
+ //插入更新数据
|
|
|
_, err3 := svcRegister.InsertEntityBytbl("OilCorporateInfo", &model)
|
|
|
if err3 == nil {
|
|
|
errinfo.Message = "审核通过!"
|
|
|
@@ -238,28 +238,6 @@ func (this *OilCorporateInfoController) AddUser() {
|
|
|
this.Data["json"] = &errinfo
|
|
|
this.ServeJSON()
|
|
|
}
|
|
|
-
|
|
|
- // var model2 register.UpdateOilCorporateInfo
|
|
|
- // model2.UserId = userentity.Id
|
|
|
- // model2.CheckStatus = 1 //通过审核
|
|
|
- // model2.CreateBy = userentity.Realname
|
|
|
- // model2.CreateUserId = userentity.Id
|
|
|
- // svcRegister := register.GetOilCorporateInfoService(utils.DBE)
|
|
|
- // Id := strconv.Itoa(model.Id)
|
|
|
- // var cols []string = []string{"UserId", "CheckStatus", "CreateBy", "CreateUserId"}
|
|
|
- // err2 := svcRegister.UpdateEntityBytbl("OilCorporateInfo", Id, &model2, cols)
|
|
|
- // if err2 == nil {
|
|
|
- // errinfo.Message = "审核通过!"
|
|
|
- // errinfo.Code = 0
|
|
|
- // errinfo.Item = model.Id
|
|
|
- // this.Data["json"] = &errinfo
|
|
|
- // this.ServeJSON()
|
|
|
- // } else {
|
|
|
- // errinfo.Message = "操作失败!"
|
|
|
- // errinfo.Code = -1
|
|
|
- // this.Data["json"] = &errinfo
|
|
|
- // this.ServeJSON()
|
|
|
- // }
|
|
|
} else {
|
|
|
errinfo.Message = "操作失败!"
|
|
|
errinfo.Code = -1
|