fix: 1-表单验证 2-小程序用户头像

controllers/admin.go

@@ -73,6 +73,7 @@ func (c *AdminCommon) Login() {
 	}
 	resp.ProductName = productName
 	resp.Authority = adminWx.Authority
+	resp.Headimgurl = adminWx.Headimgurl
 	c.OkDetailed(resp, "登录成功")
 }
 

controllers/seal.go

@@ -33,21 +33,32 @@ func (c *SealCommon) Add() {
 		return
 	}
 
-	//参数校验
-	paramVerify := utils.Rules{
-		"Use":         {utils.NotEmpty()},
-		"CompanyName": {utils.NotEmpty()},
-		"CreditCode":  {utils.NotEmpty()},
-		"ServiceType": {utils.NotEmpty()},
-		"SealType":    {utils.NotEmpty()},
-		"FileUrl":     {utils.NotEmpty()},
+	// 参数校验
+	if req.Use == "" {
+		c.FailWithMessage("用印用途不能为空", "用印用途不能为空")
+		return
 	}
-	err = utils.Verify(req, paramVerify, utils.LANG_CN)
-
-	if err != nil {
-		c.FailWithMessage("缺少参数", err.Error())
+	if req.CompanyName == "" {
+		c.FailWithMessage("客户名称不能为空", "客户名称不能为空")
+		return
+	}
+	if req.CreditCode == "" {
+		c.FailWithMessage("社会统一信用代码不能为空", "社会统一信用代码不能为空")
+		return
+	}
+	if req.ServiceType == "" {
+		c.FailWithMessage("合同类型不能为空", "合同类型不能为空")
+		return
+	}
+	if req.SealType == "" {
+		c.FailWithMessage("印章类型不能为空", "印章类型不能为空")
 		return
 	}
+	if req.FileUrl == "" {
+		c.FailWithMessage("合同附件不能为空", "合同附件不能为空")
+		return
+	}
+
 	sealInfo, err := sealService.AddSeal(c.AdminWx.AdminId, req.ContractId, req.FileNum, c.AdminWx.RealName, req.Use, req.UseCompanyName, req.CompanyName, req.CreditCode, req.ServiceType, req.SealType, req.Remark, req.FileUrl)
 	if err != nil {
 		c.FailWithMessage("用印添加失败", err.Error())
@@ -78,22 +89,36 @@ func (c *SealCommon) Edit() {
 		return
 	}
 
-	//参数校验
-	paramVerify := utils.Rules{
-		"SealId":      {utils.NotEmpty()},
-		"Use":         {utils.NotEmpty()},
-		"CompanyName": {utils.NotEmpty()},
-		"CreditCode":  {utils.NotEmpty()},
-		"ServiceType": {utils.NotEmpty()},
-		"SealType":    {utils.NotEmpty()},
-		"FileUrl":     {utils.NotEmpty()},
-	}
-	err = utils.Verify(req, paramVerify, utils.LANG_CN)
-
+	// 参数校验
 	if req.SealId <= 0 {
-		c.FailWithMessage("合同编号必传！", "合同编号必传！")
+		c.FailWithMessage("用印编号不能为空", "用印编号不能为空")
+		return
+	}
+	if req.Use == "" {
+		c.FailWithMessage("用印用途不能为空", "用印用途不能为空")
+		return
+	}
+	if req.CompanyName == "" {
+		c.FailWithMessage("客户名称不能为空", "客户名称不能为空")
 		return
 	}
+	if req.CreditCode == "" {
+		c.FailWithMessage("社会统一信用代码不能为空", "社会统一信用代码不能为空")
+		return
+	}
+	if req.ServiceType == "" {
+		c.FailWithMessage("合同类型不能为空", "合同类型不能为空")
+		return
+	}
+	if req.SealType == "" {
+		c.FailWithMessage("印章类型不能为空", "印章类型不能为空")
+		return
+	}
+	if req.FileUrl == "" {
+		c.FailWithMessage("合同附件不能为空", "合同附件不能为空")
+		return
+	}
+
 	sealInfo, err := sealService.Edit(req.SealId, c.AdminWx.AdminId, req.ContractId, req.FileNum, req.Use, req.CompanyName, req.UseCompanyName, req.CreditCode, req.ServiceType, req.SealType, req.Remark, req.FileUrl, c.AdminWx.RealName)
 	if err != nil {
 		c.FailWithMessage("修改合同失败！", "修改合同失败，Err:"+err.Error())
@@ -123,21 +148,22 @@ func (c *SealCommon) CheckEdit() {
 		return
 	}
 
-	//参数校验
-	paramVerify := utils.Rules{
-		"SealId":      {utils.NotEmpty()},
-		"Use":         {utils.NotEmpty()},
-		"CompanyName": {utils.NotEmpty()},
-		"CreditCode":  {utils.NotEmpty()},
-		"ServiceType": {utils.NotEmpty()},
-		"SealType":    {utils.NotEmpty()},
-		"FileUrl":     {utils.NotEmpty()},
-	}
-	err = utils.Verify(req, paramVerify, utils.LANG_CN)
-
+	// 参数校验
 	sealId := req.SealId
 	if sealId <= 0 {
-		c.FailWithMessage("请传入用印单编号！", "请传入用印单编号！")
+		c.FailWithMessage("用印编号不能为空", "用印编号不能为空")
+		return
+	}
+	if req.Use == "" {
+		c.FailWithMessage("用印用途不能为空", "用印用途不能为空")
+		return
+	}
+	if req.SealType == "" {
+		c.FailWithMessage("印章类型不能为空", "印章类型不能为空")
+		return
+	}
+	if req.FileUrl == "" {
+		c.FailWithMessage("合同附件不能为空", "合同附件不能为空")
 		return
 	}