Merge branch 'bzq/fix_help_cf' of hongze/hz_crm_api into debug

controllers/company_service_record.go

@@ -138,18 +138,20 @@ func (this *CompanyServiceRecordController) ServiceRecordAdd() {
 	}
 
 	//权益客户新增历史备注总表
-	itemRecord := new(company.CompanyHistoryRemark)
-	itemRecord.CompanyId = req.CompanyId
-	itemRecord.Content = req.Content
-	itemRecord.SysAdminId = sysUser.AdminId
-	itemRecord.SysAdminName = sysUser.RealName
-	itemRecord.CreateTime = time.Now().Local()
-	itemRecord.ModifyTime = time.Now().Local()
-	itemRecord.ShowTime = time.Now().Local()
-	itemRecord.ProductId = 2
-	itemRecord.TableName = "company_service_record"
-	itemRecord.TableId = newId
-	go services.AddCompanyHistoryRemark(itemRecord)
+	if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_GROUP || sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER || sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN {
+		itemRecord := new(company.CompanyHistoryRemark)
+		itemRecord.CompanyId = req.CompanyId
+		itemRecord.Content = req.Content
+		itemRecord.SysAdminId = sysUser.AdminId
+		itemRecord.SysAdminName = sysUser.RealName
+		itemRecord.CreateTime = time.Now().Local()
+		itemRecord.ModifyTime = time.Now().Local()
+		itemRecord.ShowTime = time.Now().Local()
+		itemRecord.ProductId = 2
+		itemRecord.TableName = "company_service_record"
+		itemRecord.TableId = newId
+		go services.AddCompanyHistoryRemark(itemRecord)
+	}
 
 	br.Ret = 200
 	br.Success = true

controllers/company_share.go

@@ -594,6 +594,10 @@ func (this *CompanyController) CompanyShareList() {
 				//如果已经是共享客户了，取消共享按钮全都显示，和修改销售权限一样
 				v.BtnItem.BtnShare = true
 			}
+			//解决共享客户正式筛选下是否标红的问题
+			if v.WeekViewActive == 0 && v.IsUserMaker == 1 {
+				v.WeekViewActive = 1
+			}
 
 			companyList := &company.CompanyListItem{
 				CompanyId:        v.CompanyId,

controllers/help_doc/doc.go

@@ -3,7 +3,6 @@ package help_doc
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hz_crm_api/controllers"
 	"hongze/hz_crm_api/models"
 	"hongze/hz_crm_api/models/help_doc"
@@ -12,6 +11,8 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
 // HelpDocController 帮助文档
@@ -87,6 +88,17 @@ func (this *HelpDocController) Add() {
 	if req.Status == 2 {
 		item.PublishTime = time.Now()
 	}
+	if req.Id > 0 {
+		tmpHelpDoc, err := help_doc.GetHelpDocById(int(req.Id))
+		if err != nil {
+			br.Msg = "保存失败"
+			br.ErrMsg = "查询帮助文档失败,Err:" + err.Error()
+			return
+		}
+		if tmpHelpDoc.Status != req.Status {
+			req.IsChange = true
+		}
+	}
 
 	if req.Id == 0 {
 		id, e := help_doc.AddHelpDoc(item)

models/company/company.go

@@ -1784,7 +1784,7 @@ func GetShareCompanyList(condition, sortStr string, pars []interface{}, startSiz
 	t := time.Now().Local().AddDate(0, 0, -7).Format(utils.FormatDate)
 
 	sql := `SELECT a.company_id,a.company_name,a.credit_code,a.company_code,a.created_time,a.province,a.city,
-a.address,a.region_type,b.group_id,b.road_show_total,b.is_share,b.share_seller_id,b.share_seller,
+a.address,a.region_type,b.group_id,b.road_show_total,b.is_share,b.share_seller_id,b.share_seller,b.is_user_maker,
 			CASE 
      WHEN GROUP_CONCAT(b.status) LIKE "%永续%" THEN 1
 	 WHEN GROUP_CONCAT(b.status) LIKE "%正式%" THEN 2