Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/admin/controller/taskStatistics/TaskStatisticsController.java

@@ -380,7 +380,16 @@ public class TaskStatisticsController {
      **/
     @PostMapping("/insuranceCompanyExcel")
     @ApiOperation(value = "任务统计-保险公司-导出")
-    public HttpResult insuranceCompanyExcel(@RequestBody TaskStatisticsVo taskStatisticsVo) {
+    public HttpResult insuranceCompanyExcel(@RequestBody TaskStatisticsVo taskStatisticsVo, HttpServletRequest httpServerRequest) {
+        KztGetDeptUtils kztGetDeptUtils = new KztGetDeptUtils();
+        KztGetDeptUtilsDto kztGetDeptUtilsDto = kztGetDeptUtils.KztGetDeptIds(httpServerRequest.getRequestURL().toString());
+        if(ObjectUtils.isNotEmpty(kztGetDeptUtilsDto)){
+            if("1".equals(kztGetDeptUtilsDto.getType())){
+                taskStatisticsVo.setDeptIds(kztGetDeptUtilsDto.getIds());
+            } else if ("2".equals(kztGetDeptUtilsDto.getType())) {
+                taskStatisticsVo.setUserIds(kztGetDeptUtilsDto.getIds());
+            }
+        }
         taskStatisticsVo.filterTime();
         return this.taskStatisticsService.insuranceCompanyExcel(taskStatisticsVo);
     }

src/main/java/com/ydtech/modules/protocols/entity/po/InsFeeOrderNew.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.protocols.entity.po;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -334,7 +335,7 @@ public class InsFeeOrderNew {
     private BigDecimal thirdDetailPremiums;
 
     @ApiModelProperty(value = "一级分销用户id")
-    @TableField(value = "first_level_user_id")
+    @TableField(value = "first_level_user_id",updateStrategy = FieldStrategy.IGNORED)
     private String firstLevelUserId;
 
     @ApiModelProperty(value = "一级分销用户信息")
@@ -342,7 +343,7 @@ public class InsFeeOrderNew {
     private String firstLevelUserInfo;
 
     @ApiModelProperty(value = "二级分销用户id")
-    @TableField(value = "two_level_user_id")
+    @TableField(value = "two_level_user_id",updateStrategy = FieldStrategy.IGNORED)
     private String twoLevelUserId;
 
     @ApiModelProperty(value = "二级分销用户信息")
@@ -350,7 +351,7 @@ public class InsFeeOrderNew {
     private String twoLevelUserInfo;
 
     @ApiModelProperty(value = "三级分销用户id")
-    @TableField(value = "three_level_user_id")
+    @TableField(value = "three_level_user_id",updateStrategy = FieldStrategy.IGNORED)
     private String threeLevelUserId;
 
     @ApiModelProperty(value = "三级分销用户信息")