From 2c335d0d59c18b2bb7adc29889a3c66132363cb9 Mon Sep 17 00:00:00 2001
From: hp <2969694837@qq.com>
Date: Sat, 29 Oct 2022 11:43:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BA=BA=E5=91=98=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppCrmCustomerTempQuery.java              |  4 ++--
 .../crmcustomertemp/CrmCustomerTempRest.java  |  5 -----
 .../CrmCustomerTempService.java               | 19 +++++++++++--------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempQuery.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempQuery.java
index 0082e1b20e..9952c78458 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempQuery.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempQuery.java
@@ -35,7 +35,7 @@ public class AppCrmCustomerTempQuery implements Query {
 	@ApiModelProperty("客户分类key")
     private String customerClassKey;
 
-    @ApiModelProperty("组织机构sid")
-    private String orgPath;
+//    @ApiModelProperty("组织机构sid")
+//    private String orgPath;
 
 }
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java
index b6479cf73f..ea8c214f80 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java
@@ -191,11 +191,6 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign {
         PagerVo<AppCrmCustomerTempVo> page = new PagerVo<>();
         IPage<AppCrmCustomerTempVo> iPage = crmCustomerTempService.getCustomerTempListByUserSid(pagerQuery);
         List<AppCrmCustomerTempVo> records = iPage.getRecords();
-        for (AppCrmCustomerTempVo record : records) {
-            if ("0".equals(record.getIsOnRemindkey())) {
-                record.setRemind_day("未设置提醒");
-            }
-        }
         PagerVo<AppCrmCustomerTempVo> pagerVo = PagerUtil.pageToVo(iPage, page);
 //	    for (AppCrmCustomerTempVo record : pagerVo.getRecords()) {
 //			String sid = record.getSid();
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
index b206dc150a..5d2a413123 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
@@ -481,7 +481,7 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         AppCrmCustomerTempQuery params = pagerQuery.getParams();
         String userSid = params.getUserSid();
         String name = params.getName();
-        String orgPath = params.getOrgPath();
+//        String orgPath = params.getOrgPath();
         QueryWrapper<CrmCustomerTemp> qw = new QueryWrapper<>();
 
         if (params != null) {
@@ -490,13 +490,13 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
                 String staffSid = sysUserFeign.fetchBySid(userSid).getData().getStaffSid();
                 qw.eq("cct.staffSid", staffSid);
             }
-            if (StringUtils.isNotBlank(orgPath)) {
-                orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
-                qw.eq("cct.createOrgSid", orgPath);
-            } else {
-                orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-                qw.eq("cct.createOrgSid", orgPath);
-            }
+//            if (StringUtils.isNotBlank(orgPath)) {
+//                orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+//                qw.eq("cct.createOrgSid", orgPath);
+//            } else {
+//                orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+//                qw.eq("cct.createOrgSid", orgPath);
+//            }
             if (StringUtils.isNotBlank(name)) {
                 qw.like("cct.name", name);
             }
@@ -504,6 +504,9 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         qw.orderByDesc("cct.id");
         IPage<AppCrmCustomerTempVo> iPage = baseMapper.getCustomerTempListByUserSid(page, qw);
         for (AppCrmCustomerTempVo record : iPage.getRecords()) {
+            if (record.getIsOnRemindkey() == 0) {
+                record.setRemind_day("未设置提醒");
+            }
             String urlPrefix = fileUploadComponent.getUrlPrefix();
             String customerPhoto = record.getCustomerPhoto();
             if (customerPhoto != null) {