bug fix

zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/dto/enforce/job/EnforceDeductRecordQuery.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel("其他扣分情形列表查询条件")
 public class EnforceDeductRecordQuery extends PageQuery {
@@ -12,6 +14,10 @@ public class EnforceDeductRecordQuery extends PageQuery {
     @ApiModelProperty(value = "执法机构ID")
     private String enforceOrgId;
 
+
+    @ApiModelProperty(value = "执法机构ID")
+    private List<String> enforceOrgIds;
+
     @ApiModelProperty(value = "扣分人员id")
     private String executorId;
 

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/controller/enforce/job/EnforceDeductRecordController.java

@@ -1,6 +1,7 @@
 package com.zfjg.manage.controller.enforce.job;
 
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.zfjg.common.core.domain.R;
 import com.zfjg.common.core.utils.StringUtils;
 import com.zfjg.common.core.utils.poi.ExcelUtil;
@@ -9,6 +10,7 @@ import com.zfjg.manage.api.domain.enforce.job.EnforceDeductRecord;
 import com.zfjg.manage.api.dto.enforce.job.EnforceDeductRecordDTO;
 import com.zfjg.manage.api.dto.enforce.job.EnforceDeductRecordQuery;
 import com.zfjg.manage.api.dto.enforce.job.EnforcementJobAverageTimeDTO;
+import com.zfjg.manage.api.dto.enforce.job.EnforcementJobProcessQuery;
 import com.zfjg.manage.service.enforce.job.IEnforceDeductRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
@@ -17,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.ApiOperation;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
 import java.util.List;
 
 import static com.zfjg.common.core.utils.PageUtils.startPage;
@@ -64,14 +67,23 @@ public class EnforceDeductRecordController {
 	@ApiOperation(value="分页查询")
     @GetMapping("/enforceDeductRecord/page")
     public TableInfo<EnforceDeductRecordDTO> getPage(EnforceDeductRecordQuery query) {
+        getOrgIds(query);
         startPage();
         List<EnforceDeductRecordDTO> list = enforceDeductRecordService.selectEnforceDeductRecordList(query);
         return new TableInfo<>(list);
     }
 
+    public void getOrgIds(EnforceDeductRecordQuery query) {
+        if (ObjectUtils.isNotEmpty(query.getEnforceOrgId())) {
+            query.setEnforceOrgIds(Arrays.asList(query.getEnforceOrgId().split(",")));
+        }
+        query.setEnforceOrgId(null);
+    }
+
     @ApiOperation(value="列表导出")
     @GetMapping("/enforceDeductRecord/page/export")
     public void export(HttpServletResponse response, EnforceDeductRecordQuery query) {
+        getOrgIds(query);
         List<EnforceDeductRecordDTO> list = enforceDeductRecordService.selectEnforceDeductRecordList(query);
         list.forEach(e->{
             String name = "";

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/impl/enforce/job/EnforceDeductRecordServiceImpl.java

@@ -116,7 +116,7 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
 
     @Override
     public List<EnforceDeductRecordDTO> selectEnforceDeductRecordList(EnforceDeductRecordQuery query) {
-        if (ObjectUtil.isEmpty(query.getEnforceOrgId())) {
+        if (ObjectUtils.isEmpty(query.getEnforceOrgIds())) {
             String orgId = SecurityUtils.getOrgId();
             List<SysDept> sysDepts = deptMapper.selectList(new LambdaQueryWrapper<SysDept>()
                     .select(SysDept::getRegionCode, SysDept::getParentId)