Browse Source

新增是否权益标识字段

tuoling805 2 years ago
parent
commit
298b7de3e5

+ 4 - 0
controllers/admin.go

@@ -81,6 +81,10 @@ func (c *AdminCommon) Login() {
 	if adminWx.AdminId == 66 {
 		resp.IsBusinessTrip = true
 	}
+
+	if adminWx.RoleTypeCode == "rai_seller" || adminWx.RoleTypeCode == "rai_group" || adminWx.RoleTypeCode == "rai_admin" {
+		resp.IsRai = true
+	}
 	c.OkDetailed(resp, "登录成功")
 }
 

+ 6 - 6
controllers/business_trip/business_apply.go

@@ -207,13 +207,13 @@ func (this *BusinessTrip) ApplyAdd() {
 
 		first := "您好,有新的申请待处理"
 		keyword1 := sysUser.RealName
-		keyword2 := sysUser.Mobile
+		keyword2 := "--" //sysUser.Mobile
 		keyword3 := time.Now().Format(utils.FormatDateTime)
 		var keyword4 string
 		if req.PeerPeopleId != "" {
-			keyword4 = req.ArriveDate + "----" + req.ReturnDate + "," + req.Transportation + "前往" + req.Province + req.City + "," + "同行人" + req.PeerPeopleName
+			keyword4 = req.ArriveDate + "" + req.ReturnDate + "," + req.Transportation + "前往" + req.Province + req.City + "," + "同行人" + req.PeerPeopleName
 		} else {
-			keyword4 = req.ArriveDate + "----" + req.ReturnDate + "," + req.Transportation + "前往" + req.Province + req.City
+			keyword4 = req.ArriveDate + "" + req.ReturnDate + "," + req.Transportation + "前往" + req.Province + req.City
 		}
 		remark := "请尽快完成审批"
 		go services.SendWxMsgWithRoadshowPending(first, keyword1, keyword2, keyword3, keyword4, remark, wxAppPath, approveItem.Mobile)
@@ -438,13 +438,13 @@ func (this *BusinessTrip) ApplyEdit() {
 		}
 		first := "您好,有新的申请待处理"
 		keyword1 := sysUser.RealName
-		keyword2 := sysUser.Mobile
+		keyword2 := "--" //sysUser.Mobile
 		keyword3 := time.Now().Format(utils.FormatDateTime)
 		var keyword4 string
 		if req.PeerPeopleId != "" {
-			keyword4 = req.ArriveDate + "----" + req.ReturnDate + "," + req.Transportation + "前往" + req.Province + req.City + "," + "同行人" + req.PeerPeopleName
+			keyword4 = req.ArriveDate + "" + req.ReturnDate + "," + req.Transportation + "前往" + req.Province + req.City + "," + "同行人" + req.PeerPeopleName
 		} else {
-			keyword4 = req.ArriveDate + "----" + req.ReturnDate + "," + req.Transportation + "前往" + req.Province + req.City
+			keyword4 = req.ArriveDate + "" + req.ReturnDate + "," + req.Transportation + "前往" + req.Province + req.City
 		}
 		remark := "请尽快完成审批"
 		go services.SendWxMsgWithRoadshowPending(first, keyword1, keyword2, keyword3, keyword4, remark, wxAppPath, approveItem.Mobile)

+ 1 - 0
models/response/admin/admin.go

@@ -12,4 +12,5 @@ type LoginResp struct {
 	ProductName    string `description:"产品名称:admin,ficc,权益"`
 	Authority      int    `description:"管理权限,0:无,1:部门负责人,2:小组负责人,3:超级管理员"`
 	IsBusinessTrip bool   `description:"是否出差审批:true,审批,false:无审批"`
+	IsRai          bool   `description:"是否为权益用户:true,是,false:否"`
 }