Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml

@@ -112,7 +112,7 @@
     </select>
 
     <select id="getDistributorList" resultType="com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsListVo">
-        select sid, disName orgName, pDistributorName, registNum, contract, mobile
+        select sid, disName , pDistributorName, registNum, contract, mobile
         from base_distributor ${ew.customSqlSegment}
     </select>
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java

@@ -100,7 +100,7 @@ public class BaseMiddlemanService extends MybatisBaseService<BaseMiddlemanMapper
         if (StringUtils.isBlank(dtoSid)) {
             BaseMiddleman baseMiddleman = new BaseMiddleman();
             BeanUtil.copyProperties(dto, baseMiddleman, "sid");
-            String middleCode = HanZiConverterPinYin.getPinYinFirst(baseMiddleman.getName()) + baseMiddleman.getMobile();
+            String middleCode = HanZiConverterPinYin.getPinYinFirst(baseMiddleman.getName()) + baseMiddleman.getMobile().substring(baseMiddleman.getMobile().length() - 4);
             baseMiddleman.setMiddleCode(middleCode);
             baseMiddleman.setUseOrgSid(orgPath);
             baseMiddleman.setCreateOrgSid(orgPath);
@@ -111,7 +111,7 @@ public class BaseMiddlemanService extends MybatisBaseService<BaseMiddlemanMapper
                 return rb.setMsg("该数据不存在");
             }
             BeanUtil.copyProperties(dto, baseMiddleman);
-            String middleCode = HanZiConverterPinYin.getPinYinFirst(baseMiddleman.getName()) + baseMiddleman.getMobile();
+            String middleCode = HanZiConverterPinYin.getPinYinFirst(baseMiddleman.getName()) + baseMiddleman.getMobile().substring(baseMiddleman.getMobile().length() - 4);
             baseMiddleman.setMiddleCode(middleCode);
             baseMiddleman.setUseOrgSid(orgPath);
             baseMapper.updateById(baseMiddleman);

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;
 
 }

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();

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) {