|
|
@@ -179,6 +179,113 @@ func (this *OilCorporateInfoController) DeleteInfo() {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+// @Title 添加新用户
|
|
|
+// @Description 添加新用户信息
|
|
|
+// @Success 200 {object} controllers.Request
|
|
|
+// @router /comaudit [post]
|
|
|
+func (this *OilCorporateInfoController) ComAudit() {
|
|
|
+ var err error
|
|
|
+ Remark := this.GetString("AuditorRemark")
|
|
|
+ SuccessStatus := this.GetString("SuccessStatus")
|
|
|
+ svc := register.GetOilCorporateInfoService(utils.DBE)
|
|
|
+ paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
|
|
|
+ var model register.OilCorporateInfo
|
|
|
+ var upmodel register.OilCorporateInfo
|
|
|
+ var errinfo ErrorDataInfo
|
|
|
+ var jsonBlob = this.Ctx.Input.RequestBody
|
|
|
+ json.Unmarshal(jsonBlob, &model)
|
|
|
+ if SuccessStatus == "1" {
|
|
|
+ var roleid string
|
|
|
+ roleid = paramSvc.GetBaseparameterMessage("", "paramset", "QiYeRegRoleId")
|
|
|
+ //注册用户Base_User
|
|
|
+ var userentity userRole.Base_User
|
|
|
+ userentity.Username = model.UserName
|
|
|
+ userentity.Realname = model.UserRealName
|
|
|
+ userentity.Telephone = model.UserTelephone
|
|
|
+ userentity.Roleid, _ = strconv.Atoi(roleid) //企业用户
|
|
|
+ userentity.IsCompanyUser = 1
|
|
|
+ userentity.Createon = time.Now()
|
|
|
+
|
|
|
+ //处理密码
|
|
|
+ pwd, key, errrk := utils.TripleDesEncrypt(model.UserPass)
|
|
|
+ if errrk != nil {
|
|
|
+ errinfo.Message = "密码格式不对！" + utils.AlertProcess(errrk.Error())
|
|
|
+ errinfo.Code = -2
|
|
|
+ this.Data["json"] = &errinfo
|
|
|
+ this.ServeJSON()
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ userentity.Userpassword = pwd
|
|
|
+ userentity.Publickey = key
|
|
|
+ userentity.Auditstatus = 1
|
|
|
+ //userentity.AccCode = "s5OVE"
|
|
|
+
|
|
|
+ userSvc := userRole.GetUserService(utils.DBE)
|
|
|
+
|
|
|
+ // 添加新用户
|
|
|
+ err := userSvc.AddUser(&userentity)
|
|
|
+
|
|
|
+ if err == nil {
|
|
|
+ // 添加企业用户角色
|
|
|
+ utils.RBAC.AddRoleForUserInDomain("uid_"+strconv.Itoa(userentity.Id), "rid_"+roleid, utils.DOMAIN)
|
|
|
+ // 更新企业信息
|
|
|
+ model.Remark = Remark
|
|
|
+ model.UserId = userentity.Id
|
|
|
+ model.CheckStatus = 1 //通过审核
|
|
|
+ model.CreateBy = userentity.Realname
|
|
|
+ model.CreateUserId = userentity.Id
|
|
|
+ svcRegister := register.GetOilCorporateInfoService(utils.DBE)
|
|
|
+ //删除原有数据（由于采用 svcRegister.UpdateEntityById() 一直报错，所以采用先删除再添加的方式达到更新数据的目的！）
|
|
|
+ where := " Id = " + strconv.Itoa(model.Id)
|
|
|
+ err2 := svcRegister.DeleteEntityBytbl(OilCorporateInfoName, where)
|
|
|
+ if err2 == nil {
|
|
|
+ //插入更新数据
|
|
|
+ _, err3 := svcRegister.InsertEntityBytbl(OilCorporateInfoName, &model)
|
|
|
+ if err3 == nil {
|
|
|
+ errinfo.Message = "审核通过！"
|
|
|
+ errinfo.Code = 0
|
|
|
+ errinfo.Item = model.Id
|
|
|
+ this.Data["json"] = &errinfo
|
|
|
+ this.ServeJSON()
|
|
|
+ } else {
|
|
|
+ errinfo.Message = "操作失败！--1"
|
|
|
+ errinfo.Code = -1
|
|
|
+ this.Data["json"] = &errinfo
|
|
|
+ this.ServeJSON()
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ errinfo.Message = "操作失败！--2"
|
|
|
+ errinfo.Code = -1
|
|
|
+ this.Data["json"] = &errinfo
|
|
|
+ this.ServeJSON()
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ errinfo.Message = "操作失败！--3"
|
|
|
+ errinfo.Code = -1
|
|
|
+ this.Data["json"] = &errinfo
|
|
|
+ this.ServeJSON()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ upmodel.Remark = Remark
|
|
|
+ upmodel.CheckStatus = -1 //未通过审核
|
|
|
+ cols := []string{"Remark", "CheckStatus"}
|
|
|
+ err = svc.UpdateEntityBytbl(OilCorporateInfoName, model.Id, &upmodel, cols)
|
|
|
+ if err == nil {
|
|
|
+ errinfo.Message = "审核未通过！"
|
|
|
+ errinfo.Code = 0
|
|
|
+ this.Data["json"] = &errinfo
|
|
|
+ this.ServeJSON()
|
|
|
+ } else {
|
|
|
+ errinfo.Message = "操作失败！" + utils.AlertProcess(err.Error())
|
|
|
+ errinfo.Code = -1
|
|
|
+ this.Data["json"] = &errinfo
|
|
|
+ this.ServeJSON()
|
|
|
+ }
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
// @Title 添加新用户
|
|
|
// @Description 添加新用户信息
|
|
|
// @Success 200 {object} controllers.Request
|
|
|
@@ -199,13 +306,8 @@ func (this *OilCorporateInfoController) AddUser() {
|
|
|
userentity.Realname = model.UserRealName
|
|
|
userentity.Telephone = model.UserTelephone
|
|
|
userentity.Roleid, _ = strconv.Atoi(roleid) //企业用户
|
|
|
- // userentity.Companyid = "0"
|
|
|
userentity.IsCompanyUser = 1
|
|
|
- // userentity.Departmentid = "100000171"
|
|
|
- // userentity.Departmentname = "供方企业"
|
|
|
userentity.Createon = time.Now()
|
|
|
- // userentity.CreateBy = this.User.Realname
|
|
|
- // userentity.Createuserid = 284
|
|
|
|
|
|
//处理密码
|
|
|
pwd, key, errrk := utils.TripleDesEncrypt(model.UserPass)
|
huahaiyan