Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into cygx_10.4

services/company_permission.go

@@ -154,7 +154,7 @@ func GetUserHasPermissionActivity(user *models.WxUserItem, activityInfo *models.
 		if applyCount > 0 {
 			hasPermission = 4
 		} else {
-			hasPermission = 5
+			hasPermission = 3
 		}
 		return
 	}

services/send_company_user.go

@@ -50,7 +50,7 @@ type OriginalUserInfoResp struct {
 	RealName string `json:"RealName"`
 }
 
-//c
+// c
 func SendComapnyToShanghai(url, jsonCompany, postType string) (err error) {
 	var msg string
 	defer func() {
@@ -158,7 +158,7 @@ func DotongbuShangHai(cont context.Context) (err error) {
 		}
 	}
 
-	condition = ` AND p.is_suspend = 0  AND p.modify_time > ` + "'" + updateTime + "'"
+	condition = ` AND p.is_suspend = 0  AND a.modify_time > ` + "'" + updateTime + "'"
 	companyIds = strings.TrimRight(companyIds, ",")
 
 	fmt.Println("获取冻结跟流失的用户", len(listFreezeAndLoss))
@@ -510,7 +510,7 @@ func DotongbuShangHaiSendEmail(cont context.Context) (err error) {
 	return
 }
 
-//DeleteUserDotongbuShangHaApi 删除用户进行同步
+// DeleteUserDotongbuShangHaApi 删除用户进行同步
 func DeleteUserDotongbuShangHaiApi() (err error) {
 	var msg string
 	defer func() {
@@ -581,7 +581,7 @@ func DeleteUserDotongbuShangHaiApi() (err error) {
 	return
 }
 
-//获取用户的Token
+// 获取用户的Token
 func GetShangHaiCrmApiToken() (token string, err error) {
 	var msg string
 	defer func() {
@@ -627,7 +627,7 @@ func GetShangHaiCrmApiToken() (token string, err error) {
 	return
 }
 
-//处理被禁用的用户，将禁用用户的状态转冻结
+// 处理被禁用的用户，将禁用用户的状态转冻结
 func CompanySuspend() (err error) {
 	var msg string
 	defer func() {