Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

dsk-admin/src/main/resources/application-pre.yml

@@ -9,12 +9,12 @@ shuzhihua:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/dsk/uploadPath，Linux配置 /home/server/dsk-operate-sys/uploadPath）
-#  profile: D:/dsk-operate-sys/uploadPath/
+  #  profile: D:/dsk-operate-sys/uploadPath/
   profile: /home/server/dsk-operate-sys/uploadPath/
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
-  captchaType: math
+  captchaType: char
 
 # 开发环境配置
 server:
@@ -56,9 +56,9 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://47.104.91.229:3306/dsk-operate-sys?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://192.168.0.79:3306/dsk-operate-sys?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: dev
-        password: zfTFIJjaN#6xB83r
+        password: 8AXjjCHZ666!
       # 从库数据源
       #            slave:
       #                # 从数据源开关/默认关闭
@@ -113,8 +113,8 @@ spring:
   messages:
     # 国际化资源文件路径
     basename: i18n/messages
-#  profiles:
-#    active: druid
+  #  profiles:
+  #    active: druid
   # 文件上传
   servlet:
     multipart:
@@ -130,7 +130,8 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 47.104.91.229
+    #    host: 139.9.157.49
+    host: 192.168.0.79
     # 端口，默认为6379
     port: 6379
     # 数据库索引
@@ -194,10 +195,10 @@ xss:
 
 dsk:
   open:
-#    endPoint: 120.27.13.145:8865
-#    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
-#    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
-#    protocol: http
+    #    endPoint: 120.27.13.145:8865
+    #    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
+    #    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
+    #    protocol: http
     endPoint: openapi.jiansheku.com
     accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
     accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b

dsk-operate-ui/src/views/enterpriseData/components/Group/index.vue

@@ -283,8 +283,8 @@ export default {
                 api.centralEnterprsesocial().then(res=>{
                     if(res.code==200){
                         this.isSkeleton = false;
-                        if(res.data.length>0){
-                            res.data.map(item=>{
+                        if(res.data.list.length>0){
+                            res.data.list.map(item=>{
                                 item.page=1
                             })
                         }
@@ -292,6 +292,8 @@ export default {
                         this.childListTotal = res.data.total;
                     }
                 })
+            }else{
+                this.getCompany()
             }
 
         },

dsk-system/src/main/java/com/dsk/system/domain/customer/dto/CustomerFollowRecordSearchDto.java

@@ -4,7 +4,6 @@ import com.dsk.common.core.domain.BaseEntity;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Map;
 
 /**
  * 客户跟进记录筛选对象
@@ -23,4 +22,12 @@ public class CustomerFollowRecordSearchDto extends BaseEntity implements Seriali
      * 用户id
      */
     private Long userId;
+    /**
+     * 开始时间
+     */
+    private String startTime;
+    /**
+     * 结束时间
+     */
+    private String endTime;
 }

dsk-system/src/main/java/com/dsk/system/mapper/CustomerFollowRecordMapper.java

@@ -19,7 +19,7 @@ import java.util.List;
 @Mapper
 public interface CustomerFollowRecordMapper extends BaseMapper<CustomerFollowRecord> {
 
-    List<CustomerFollowRecordListVo> selectAuthList(@Param("dto") CustomerFollowRecordSearchDto dto);
+    List<CustomerFollowRecordListVo> selectAuthList(CustomerFollowRecordSearchDto dto);
 
 }
 

dsk-system/src/main/resources/mapper/system/customer/CustomerFollowRecordMapper.xml

@@ -16,10 +16,12 @@
         join sys_user u on u.user_id = cfr.user_id
         left join sys_dept d on d.dept_id = u.dept_id
         <where>
-            <if test="dto.userId != null "> and cfr.user_id = #{dto.userId} </if>
-            <if test="dto.customerId != null and dto.customerId != '' "> and cfr.customer_id = #{dto.customerId} </if>
+            <if test="userId != null "> and cfr.user_id = #{userId} </if>
+            <if test="customerId != null and customerId != '' "> and cfr.customer_id = #{customerId} </if>
+            <if test="startTime != null and startTime != '' "> and cfr.visit_time &gt;= #{startTime} </if>
+            <if test="endTime != null and endTime != '' "> and cfr.visit_time &lt;= #{endTime} </if>
             <!-- 数据范围过滤 -->
-            <if test="dto.params.dataScope != null and dto.params.dataScope != '' "> ${dto.params.dataScope} </if>
+            <if test="params.dataScope != null and params.dataScope != '' "> ${params.dataScope} </if>
         </where>
         order by cfr.create_time desc
     </select>