Merge branch 'debug' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/sys_menu.go

@@ -90,18 +90,18 @@ func (this *SysRoleController) SysMenuList() {
 				}
 			}
 		}
-		for i, menu := range child {
-			if menu.Name == "正式客户共享" && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN &&
-				sysUser.AdminId != 66 && sysUser.AdminId != 15 {
-				//如果不是admin角色、共享客户分组下用户、楼颖丹账号、王沛账号 就不显示该页面
-				if ok, _ := shareSellerMap[sysUser.AdminId]; !ok {
-					child = append(child[:i], child[i+1:]...)
-				}
-			}
-			//if menu.Name == "正式客户共享" && !utils.InArrayByStr([]string{utils.ROLE_TYPE_CODE_ADMIN, utils.ROLE_TYPE_CODE_FICC_ADMIN, utils.ROLE_TYPE_CODE_FICC_SELLER, utils.ROLE_TYPE_CODE_FICC_GROUP, utils.ROLE_TYPE_CODE_FICC_TEAM}, sysUser.RoleTypeCode) {
-			//	child = append(child[:i], child[i+1:]...)
-			//}
-		}
+		//for i, menu := range child {
+		//	if menu.Name == "正式客户共享" && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN &&
+		//		sysUser.AdminId != 66 && sysUser.AdminId != 15 {
+		//		//如果不是admin角色、共享客户分组下用户、楼颖丹账号、王沛账号 就不显示该页面
+		//		if ok, _ := shareSellerMap[sysUser.AdminId]; !ok {
+		//			child = append(child[:i], child[i+1:]...)
+		//		}
+		//	}
+		//	//if menu.Name == "正式客户共享" && !utils.InArrayByStr([]string{utils.ROLE_TYPE_CODE_ADMIN, utils.ROLE_TYPE_CODE_FICC_ADMIN, utils.ROLE_TYPE_CODE_FICC_SELLER, utils.ROLE_TYPE_CODE_FICC_GROUP, utils.ROLE_TYPE_CODE_FICC_TEAM}, sysUser.RoleTypeCode) {
+		//	//	child = append(child[:i], child[i+1:]...)
+		//	//}
+		//}
 
 		if strings.Contains(item.Name, "出差管理") && sysUser.AdminId == utils.ApproveUserId {
 			cm := new(system.ChildMenu)

models/company/company_user.go

@@ -140,8 +140,8 @@ func GetCompanyUserListV2(condition string, pars []interface{}, companyId, start
 	if condition != "" {
 		sql += condition
 	}
-	//sql += ` group by a.user_id ORDER BY a.is_register desc,a.report_last_view_time desc,a.last_updated_time DESC LIMIT ?,? `
-	sql += ` group by a.user_id ORDER BY CASE WHEN is_follow = 1 AND (report_last_view_time < NOW()  - INTERVAL 7 DAY or report_last_view_time is NULL ) THEN 0 ELSE 1 END,a.is_register desc,a.report_last_view_time ASC,a.last_updated_time  ASC LIMIT ?,? `
+	sql += ` group by a.user_id ORDER BY CASE WHEN is_follow = 1 AND (report_last_view_time < NOW()  - INTERVAL 7 DAY or report_last_view_time is NULL ) THEN 0 ELSE 1 END,a.is_register desc,a.report_last_view_time desc,a.last_updated_time DESC LIMIT ?,? `
+	//sql += ` group by a.user_id ORDER BY CASE WHEN is_follow = 1 AND (report_last_view_time < NOW()  - INTERVAL 7 DAY or report_last_view_time is NULL ) THEN 0 ELSE 1 END,a.is_register desc,a.report_last_view_time ASC,a.last_updated_time  ASC LIMIT ?,? `
 	_, err = o.Raw(sql, companyId, pars, startSize, pageSize).QueryRows(&items)
 	return
 }