业务管理导出

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java

@@ -318,9 +318,9 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA
     @Log(detail = "导出业务申请列表",level = 4,operationUnit = OperationUnit.APPLYAMOUNTINFO,operationType = OperationType.SELECT)
     @GetMapping("/excelExport")
     @ApiOperation(value = "导出业务申请内容")
-    public ResponseResult excelExport(@RequestParam("ids") List<String> ids,HttpServletResponse response) {
+    public ResponseResult excelExport(@RequestParam("ids") List<String> ids,@RequestParam("userId")Integer userId,HttpServletResponse response) {
 
-        Boolean result = applyAmountInfoService.excelExport(ids,response);
+        Boolean result = applyAmountInfoService.excelExport(ids,userId,response);
 
         return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL();
     }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsInvestigationController.java

@@ -73,9 +73,9 @@ public class DgAssetsInvestigationController {
     @Log(detail = "导出资产部调查列表",level = 4,operationUnit = OperationUnit.ASSETS,operationType = OperationType.SELECT)
     @GetMapping("/excelExport")
     @ApiOperation(value = "导出资产部调查内容")
-    public ResponseResult excelExport(@RequestParam("ids") List<String> ids, HttpServletResponse response) {
+    public ResponseResult excelExport(@RequestParam("ids") List<String> ids,@RequestParam("userId")Integer userId, HttpServletResponse response) {
 
-        Boolean result = dgAssetsInvestigationService.excelExport(ids,response);
+        Boolean result = dgAssetsInvestigationService.excelExport(ids,userId,response);
 
         return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL();
     }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java

@@ -99,8 +99,8 @@ public class DgComplianceInvestigationController {
     @Log(detail = "导出合规调查",level = 4,operationUnit = OperationUnit.COMPLIANCE,operationType = OperationType.SELECT)
     @GetMapping("/excelExport")
     @ApiOperation(value = "导出", notes = "导出")
-    public ResponseResult query(HttpServletResponse response, @RequestParam("ids") List<String> ids) {
+    public ResponseResult query(HttpServletResponse response, @RequestParam("ids") List<String> ids,@RequestParam("userId")Integer userId) {
-        Boolean result = iDgComplianceInvestigationService.excelExport(response, ids);
+        Boolean result = iDgComplianceInvestigationService.excelExport(response, ids,userId);
         return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL();
     }
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java

@@ -73,9 +73,9 @@ public class DgGuaranteeAssignUserController {
     @Log(detail = "导出担保部调查列表",level = 4,operationUnit = OperationUnit.GUARANTEE,operationType = OperationType.SELECT)
     @GetMapping("/excelExport")
     @ApiOperation(value = "导出担保部调查内容")
-    public ResponseResult excelExport(@RequestParam("ids") List<String> ids, HttpServletResponse response) {
+    public ResponseResult excelExport(@RequestParam("ids") List<String> ids,@RequestParam("userId")Integer userId, HttpServletResponse response) {
 
-        Boolean result = dgGuaranteeAssignUserService.excelExport(ids,response);
+        Boolean result = dgGuaranteeAssignUserService.excelExport(ids,userId,response);
 
         return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL();
     }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java

@@ -59,9 +59,9 @@ public class DgGuaranteeLetterAssignUserController {
     @GetMapping("/guaranteeLetterListExport")
     public void guaranteeLetterListExport(
             @ApiParam(name = "ids", value = "多个id", required = true)
-            @RequestParam("ids") String ids,HttpServletResponse response){
+            @RequestParam("ids") String ids,@RequestParam("userId")Integer userId,HttpServletResponse response){
         try {
-            guaranteeLetterAssignUserService.batchExport(response,ids);
+            guaranteeLetterAssignUserService.batchExport(response,ids,userId);
         } catch (IOException e) {
             e.printStackTrace();
         }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanCommitteeConsiderController.java

@@ -81,8 +81,8 @@ public class DgLoanCommitteeConsiderController {
     @Log(detail = "导出贷审会列表",level = 4,operationUnit = OperationUnit.LOANCOMMITTEE,operationType = OperationType.SELECT)
     @GetMapping("excelExport")
     @ApiOperation(value = "导出", notes = "导出")
-    public ResponseResult excelExport(HttpServletResponse response, @RequestParam("ids") List<String> ids) {
+    public ResponseResult excelExport(HttpServletResponse response, @RequestParam("ids") List<String> ids,@RequestParam("userId")Integer userId) {
-        Boolean result = dgLoanCommitteeConsiderService.excelExport(response, ids);
+        Boolean result = dgLoanCommitteeConsiderService.excelExport(response, ids,userId);
         return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL();
     }
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java

@@ -57,9 +57,9 @@ public class DgLoanNoticeController {
     @GetMapping("/loanNoticeListExport")
     public void loanNoticeListExport(
             @ApiParam(name = "ids", value = "多个id", required = true)
-            @RequestParam("ids") String ids, HttpServletResponse response){
+            @RequestParam("ids") String ids,@RequestParam("userId")Integer userId, HttpServletResponse response){
         try {
-            loanNoticeService.batchExport(response,ids);
+            loanNoticeService.batchExport(response,ids,userId);
         } catch (IOException e) {
             e.printStackTrace();
         }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgMessageInvestigationController.java

@@ -73,9 +73,9 @@ public class DgMessageInvestigationController {
     @Log(detail = "导出信息部调查列表",level = 4,operationUnit = OperationUnit.MESSAGE,operationType = OperationType.SELECT)
     @GetMapping("/excelExport")
     @ApiOperation(value = "导出信息部调查内容")
-    public ResponseResult excelExport(@RequestParam("ids") List<String> ids, HttpServletResponse response) {
+    public ResponseResult excelExport(@RequestParam("ids") List<String> ids,@RequestParam("userId")Integer userId, HttpServletResponse response) {
 
-        Boolean result = dgMessageInvestigationService.excelExport(ids,response);
+        Boolean result = dgMessageInvestigationService.excelExport(ids,userId,response);
 
         return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL();
     }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java

@@ -54,9 +54,9 @@ public class DgPaymentConfirmationConsiderController {
     @GetMapping("/paymentConfirmationListExport")
     public void paymentConfirmationListExport(
             @ApiParam(name = "ids", value = "多个id", required = true)
-            @RequestParam("ids") String ids, HttpServletResponse response){
+            @RequestParam("ids") String ids,@RequestParam("userId")Integer userId, HttpServletResponse response){
         try {
-            paymentConfirmationConsiderService.batchExport(response,ids);
+            paymentConfirmationConsiderService.batchExport(response,ids,userId);
         } catch (IOException e) {
             e.printStackTrace();
         }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgWorkConferenceConsiderController.java

@@ -92,8 +92,8 @@ public class DgWorkConferenceConsiderController {
     @Log(detail = "导出工作会列表",level = 4,operationUnit = OperationUnit.WORKCONFERENCE,operationType = OperationType.SELECT)
     @GetMapping("/excelExport")
     @ApiOperation(value = "导出", notes = "导出")
-    public ResponseResult excelExport(HttpServletResponse response, @RequestParam("ids") List<String> ids){
+    public ResponseResult excelExport(HttpServletResponse response, @RequestParam("ids") List<String> ids,@RequestParam("userId")Integer userId){
-        Boolean result = dgWorkConferenceConsiderService.excelExport(response, ids);
+        Boolean result = dgWorkConferenceConsiderService.excelExport(response, ids,userId);
         return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL();
     }
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountInfoMapper.java

@@ -30,7 +30,7 @@ public interface DgApplyAmountInfoMapper extends BaseMapper<DgApplyAmountInfo> {
 
     DgApplyAmountInfoResponse selectApplyAmountInfoById(Integer id);
 
-    List<BusinessApplicationListResponse> selectListByIds(List<String> ids);
+    List<BusinessApplicationListResponse> selectListByIds(@Param("ids")List<String> ids,@Param("userId") Integer userId);
 
     DgApplyField queryApplyField();
 

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgAssetsInvestigationMapper.java

@@ -8,6 +8,7 @@ import com.daqing.financial.guarantee.model.response.DgAssetsInvestigationRespon
 import com.daqing.financial.guarantee.model.response.DgNoticeListResponse;
 import com.daqing.framework.domain.guarantee.DgAssetsInvestigation;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -26,7 +27,7 @@ public interface DgAssetsInvestigationMapper extends BaseMapper<DgAssetsInvestig
 
     DgAssetsInvestigationResponse selectInfoById(Integer id);
 
-    List<AssetsInvestigationListResponse> selectListByIds(List<String> ids);
+    List<AssetsInvestigationListResponse> selectListByIds(@Param("ids") List<String> ids, @Param("userId") Integer userId);
 
     List<DgNoticeListResponse> selectAssetsList(String userId, List<String> roleIdlist);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java

@@ -29,7 +29,7 @@ public interface DgComplianceInvestigationMapper extends BaseMapper<DgCompliance
     IPage<DgComplianceInvestigationResponse> list(Page page, @Param("cr") DgComplianceInvestigationRequest dgComplianceInvestigationRequest,
                                                   @Param("roleIds") List<Integer> roleIds, @Param("userId") Integer userId);
 
-    List<DgComplianceInvestigationResponse> listExcel(@Param("ids") List<Integer> ids);
+    List<DgComplianceInvestigationResponse> listExcel(@Param("ids") List<Integer> ids,@Param("userId")Integer userId);
 
     Boolean survey(@Param("iid") Integer iid, @Param("opinion") String opinion, @Param("date") Date date,
                    @Param("userId") Integer userId, @Param("operationStatus") Integer operationStatus,

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeAssignUserMapper.java

@@ -24,7 +24,7 @@ public interface DgGuaranteeAssignUserMapper extends BaseMapper<DgGuaranteeAssig
 
     IPage<GuaranteeListResponse> pageByCondition(Page page,@Param("customerNumberOrName") String customerNumberOrName,@Param("roleIdlist") List<String> roleIdlist,@Param("userId") String userId,@Param("status") Integer status);
 
-    List<GuaranteeListResponse> selectListByIds(List<String> ids);
+    List<GuaranteeListResponse> selectListByIds(@Param("ids") List<String> ids,@Param("userId") Integer userId);
 
     Boolean updateAuditStatusByBusinessId(@Param("businessId") Integer businessId, @Param("auditStatus") Integer auditStatus);
 

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeLetterAssignUserMapper.java

@@ -25,7 +25,7 @@ public interface DgGuaranteeLetterAssignUserMapper extends BaseMapper<DgGuarante
 
     IPage<GuaranteeLetterListResponse> pageByCondition(Page page, Integer userId, List<String> roleIdList, Integer status, String customerNumberOrName);
 
-    List<GuaranteeLetterListResponse> selectBatchData(List<String> idList);
+    List<GuaranteeLetterListResponse> selectBatchData(@Param("ids") List<String> idList,@Param("userId")Integer userId);
 
     GuaranteeLetterListResponse selectGuaranteeLetter(String businessId,String roleId);
 

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java

@@ -30,7 +30,7 @@ public interface DgLoanCommitteeConsiderMapper extends BaseMapper<DgLoanCommitte
     IPage<DgLoanCommitteeConsiderResponse> list(Page page, @Param("codeOrName") String codeOrName, @Param("roleIds") List<Integer> roleIds,
                                                 @Param("userId") Integer userId,@Param("status") Integer status);
 
-    List<DgLoanCommitteeConsiderResponse> excelList(@Param("ids") List<Integer> ids);
+    List<DgLoanCommitteeConsiderResponse> excelList(@Param("ids") List<Integer> ids,@Param("userId")Integer userId);
 
     Boolean check(@Param("lr") DgLoanCommitteeConsiderConsent dgLoanCommitteeConsiderConsent, @Param("userId") Integer userId,
                   @Param("status") Integer status, @Param("operatingStatus") Integer operatingStatus, @Param("date") Date date);

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanNoticeMapper.java

@@ -8,6 +8,7 @@ import com.daqing.financial.guarantee.model.response.LoanNoticeDetailRes;
 import com.daqing.financial.guarantee.model.response.LoanNoticeListResponse;
 import com.daqing.framework.domain.guarantee.DgLoanNotice;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -24,7 +25,7 @@ public interface DgLoanNoticeMapper extends BaseMapper<DgLoanNotice> {
 
     IPage<LoanNoticeListResponse> pageByCondition(Page page, List<String> roleIdList, Integer userId, Integer status, String customerNumberOrName);
 
-    List<LoanNoticeListResponse> selectBatchData(List<String> idList);
+    List<LoanNoticeListResponse> selectBatchData(@Param("ids") List<String> idList,@Param("userId")Integer userId);
 
     LoanNoticeListResponse selectLoanNotice(String businessId, String roleId);
 

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgMessageInvestigationMapper.java

@@ -7,6 +7,7 @@ import com.daqing.financial.guarantee.model.response.DgNoticeListResponse;
 import com.daqing.financial.guarantee.model.response.MessageInvestigationListResponse;
 import com.daqing.framework.domain.guarantee.DgMessageInvestigation;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -23,7 +24,7 @@ public interface DgMessageInvestigationMapper extends BaseMapper<DgMessageInvest
 
     IPage<MessageInvestigationListResponse> pageByCondition(Page page, String customerNumberOrName, List<String> roleIdlist, String userId, Integer status);
 
-    List<MessageInvestigationListResponse> selectListByIds(List<String> ids);
+    List<MessageInvestigationListResponse> selectListByIds(@Param("ids") List<String> ids, @Param("userId")Integer userId);
 
     List<DgNoticeListResponse> selectMessageList(String userId, List<String> roleIdlist);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgPaymentConfirmationConsiderMapper.java

@@ -8,6 +8,7 @@ import com.daqing.financial.guarantee.model.response.PaymentConfirmationDetailRe
 import com.daqing.financial.guarantee.model.response.PaymentConfirmationListResponse;
 import com.daqing.framework.domain.guarantee.DgPaymentConfirmationConsider;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -24,7 +25,7 @@ public interface DgPaymentConfirmationConsiderMapper extends BaseMapper<DgPaymen
 
     IPage<PaymentConfirmationListResponse> pageByCondition(Page page, List<String> roleIdList , Integer userId , Integer status, String customerNumberOrName);
 
-    List<PaymentConfirmationListResponse> selectBatchData(List<String> idList);
+    List<PaymentConfirmationListResponse> selectBatchData(@Param("ids") List<String> idList,@Param("userId")Integer userId);
 
     List<DgNoticeListResponse> selectPaymentConfirmationList(String userId, List<String> roleIdlist);
 

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgWorkConferenceConsiderMapper.java

@@ -27,7 +27,7 @@ public interface DgWorkConferenceConsiderMapper extends BaseMapper<DgWorkConfere
     IPage<DgWorkConferencePO> list(Page page, @Param("codeOrName") String codeOrName, @Param("roleIds") List<Integer> roleIds,
                                    @Param("userId") Integer userId, @Param("status") Integer status);
 
-    List<DgWorkConferencePO> excelList(@Param("ids") List<Integer> ids);
+    List<DgWorkConferencePO> excelList(@Param("ids") List<Integer> ids,@Param("userId")Integer userId);
 
     Boolean check(@Param("id") Integer id, @Param("userId") Integer userId, @Param("opinion") String opinion,
                   @Param("auditStatus") Integer auditStatus, @Param("operationStatus") Integer operationStatus,

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgApplyAmountInfoService.java

@@ -30,7 +30,7 @@ public interface IDgApplyAmountInfoService extends IService<DgApplyAmountInfo> {
 
     int revokeBusinessApplication(Integer id);
 
-    Boolean excelExport(List<String> ids,HttpServletResponse response);
+    Boolean excelExport(List<String> ids,Integer userId,HttpServletResponse response);
 
     int approvalBusinessApplication(Integer id, Integer status, String remark, Integer companyId);
 

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgAssetsInvestigationService.java

@@ -32,5 +32,5 @@ public interface IDgAssetsInvestigationService extends IService<DgAssetsInvestig
 
     int approvalAssets(ApprovalAssetsRequest approvalAssetsRequest);
 
-    Boolean excelExport(List<String> ids, HttpServletResponse response);
+    Boolean excelExport(List<String> ids, Integer userId, HttpServletResponse response);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgComplianceInvestigationService.java

@@ -29,7 +29,7 @@ public interface IDgComplianceInvestigationService extends IService<DgCompliance
 
     DgComplianceInvestigationInfoResponse query(Integer iid);
 
-    Boolean excelExport(HttpServletResponse response, List<String> ids);
+    Boolean excelExport(HttpServletResponse response, List<String> ids,Integer userId);
 
     String getFileUrl(String[] fileUrls);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgGuaranteeAssignUserService.java

@@ -30,7 +30,7 @@ public interface IDgGuaranteeAssignUserService extends IService<DgGuaranteeAssig
 
     int approvalGuarantee(ApprovalGuaranteeRequest approvalGuaranteeRequest);
 
-    Boolean excelExport(List<String> ids, HttpServletResponse response);
+    Boolean excelExport(List<String> ids, Integer userId, HttpServletResponse response);
 
     ResponseResult assignCorners(GuaranteeRequest guaranteeRequest);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgGuaranteeLetterAssignUserService.java

@@ -28,7 +28,7 @@ public interface IDgGuaranteeLetterAssignUserService extends IService<DgGuarante
 
     boolean updateGuaranteeLetterStatus(GuaranteeLetterUpdateStatusRequest guaranteeLetterUpdateStatusRequest);
 
-    void batchExport(HttpServletResponse response, String ids) throws IOException;
+    void batchExport(HttpServletResponse response, String ids,Integer userId) throws IOException;
 
     GuaranteeLetterListResponse selectGuaranteeLetter(String businessId,String roleId);
 

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgLoanCommitteeConsiderService.java

@@ -27,5 +27,5 @@ public interface IDgLoanCommitteeConsiderService extends IService<DgLoanCommitte
 
     DgLoanCommitteeConsiderInfoResponse query(Integer id);
 
-    Boolean excelExport(HttpServletResponse response, List<String> ids);
+    Boolean excelExport(HttpServletResponse response, List<String> ids,Integer userId);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgLoanNoticeService.java

@@ -26,7 +26,7 @@ public interface IDgLoanNoticeService extends IService<DgLoanNotice> {
 
     boolean updateLoanNotice(LoanNoticeUpdateRequest loanNoticeUpdateRequest);
 
-    void batchExport(HttpServletResponse response, String ids) throws IOException;
+    void batchExport(HttpServletResponse response, String ids, Integer userId) throws IOException;
 
     LoanNoticeListResponse selectLoanNotice(String businessId, String roleId);
 

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgMessageInvestigationService.java

@@ -32,5 +32,5 @@ public interface IDgMessageInvestigationService extends IService<DgMessageInvest
 
     int approvalMessage(ApprovalMessageRequest approvalMessageRequest);
 
-    Boolean excelExport(List<String> ids, HttpServletResponse response);
+    Boolean excelExport(List<String> ids,Integer userId, HttpServletResponse response);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgPaymentConfirmationConsiderService.java

@@ -25,7 +25,7 @@ public interface IDgPaymentConfirmationConsiderService extends IService<DgPaymen
 
     boolean updatePaymentConfirmation(PaymentConfirmationUpdateRequest paymentConfirmationUpdateRequest);
 
-    void batchExport(HttpServletResponse response,String ids) throws IOException;
+    void batchExport(HttpServletResponse response,String ids,Integer userId) throws IOException;
 
     PaymentConfirmationDetailRes paymentConfirmationDetail(Integer id);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgWorkConferenceConsiderService.java

@@ -29,5 +29,5 @@ public interface IDgWorkConferenceConsiderService extends IService<DgWorkConfere
 
     DgWorkConferenceConsiderQueryResponse query(Integer id);
 
-    Boolean excelExport(HttpServletResponse response, List<String> ids);
+    Boolean excelExport(HttpServletResponse response, List<String> ids,Integer userId);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java

@@ -561,9 +561,9 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
 
     @Transactional
     @Override
-    public Boolean excelExport(List<String> ids, HttpServletResponse response) {
+    public Boolean excelExport(List<String> ids, Integer userId, HttpServletResponse response) {
         //根据ids查询业务申请列表信息
-        List<BusinessApplicationListResponse>applyList = this.baseMapper.selectListByIds(ids);
+        List<BusinessApplicationListResponse>applyList = this.baseMapper.selectListByIds(ids,userId);
         System.out.println("applyList==========================="+applyList);
         if(applyList != null){
             if(applyList.size()>0){

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java

@@ -534,9 +534,9 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
     }
 
     @Override
-    public Boolean excelExport(List<String> ids, HttpServletResponse response) {
+    public Boolean excelExport(List<String> ids,Integer userId, HttpServletResponse response) {
         //根据ids查询业务申请列表信息
-        List<AssetsInvestigationListResponse>assetsList = this.baseMapper.selectListByIds(ids);
+        List<AssetsInvestigationListResponse>assetsList = this.baseMapper.selectListByIds(ids,userId);
         try {
             ExcelUtil.writeExcelWithSheets(response, assetsList, "资产调查一览表", "assetsInvestigation", new AssetsInvestigationListResponse())
                     .finish();

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java

@@ -566,7 +566,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
      * 导出
      */
     @Override
-    public Boolean excelExport(HttpServletResponse response, List<String> ids) {
+    public Boolean excelExport(HttpServletResponse response, List<String> ids,Integer userId) {
         if (ids == null || ids.size() == 0) {
             ExceptionCast.cast(GuaranteeCode.EXCEL_ID_NOT_NULL);
         }
@@ -574,7 +574,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
         for (String id : ids) {
             idList.add(Integer.parseInt(id));
         }
-        List<DgComplianceInvestigationResponse> list = this.getBaseMapper().listExcel(idList);
+        List<DgComplianceInvestigationResponse> list = this.getBaseMapper().listExcel(idList,userId);
         try {
             ExcelUtil.writeExcelWithSheets(response, list, "合规调查数据一览表", "NO.1", new DgComplianceInvestigationResponse())
                     .finish();

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java

@@ -762,9 +762,9 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
     }
 
     @Override
-    public Boolean excelExport(List<String> ids, HttpServletResponse response) {
+    public Boolean excelExport(List<String> ids, Integer userId, HttpServletResponse response) {
         //根据ids查询业务申请列表信息
-        List<GuaranteeListResponse> guaranteeList = this.baseMapper.selectListByIds(ids);
+        List<GuaranteeListResponse> guaranteeList = this.baseMapper.selectListByIds(ids,userId);
         System.out.println("applyList===========================" + guaranteeList);
         try {
             ExcelUtil.writeExcelWithSheets(response, guaranteeList, "担保调查一览表", "businessApplication", new GuaranteeListResponse())

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java

@@ -86,10 +86,10 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
     }
 
     @Override
-    public void batchExport(HttpServletResponse response,String ids) throws IOException {
+    public void batchExport(HttpServletResponse response,String ids,Integer userId) throws IOException {
         String[] id = ids.split(",");
         List<String> idList = Arrays.asList(id);
-        List<GuaranteeLetterListResponse> excelDataList = baseMapper.selectBatchData(idList);
+        List<GuaranteeLetterListResponse> excelDataList = baseMapper.selectBatchData(idList,userId);
         EasyExcelUtil.download(response,GuaranteeLetterListResponse.class,excelDataList,"担保函列表","第一页");
     }
 

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java

@@ -27,6 +27,7 @@ import com.daqing.framework.model.response.PromptSuccess;
 import com.daqing.framework.util.RedisUtil;
 import com.daqing.framework.utils.PageUtils;
 import com.daqing.framework.utils.excel.ExcelUtil;
+import io.swagger.models.auth.In;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -311,7 +312,7 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
      * 导出
      */
     @Override
-    public Boolean excelExport(HttpServletResponse response, List<String> ids) {
+    public Boolean excelExport(HttpServletResponse response, List<String> ids, Integer userId) {
         if (null == ids || ids.size() == 0) {
             ExceptionCast.cast(GuaranteeCode.EXCEL_ID_NOT_NULL);
         }
@@ -319,7 +320,7 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
         for (String id : ids) {
             idList.add(Integer.parseInt(id));
         }
-        List<DgLoanCommitteeConsiderResponse> list = this.getBaseMapper().excelList(idList);
+        List<DgLoanCommitteeConsiderResponse> list = this.getBaseMapper().excelList(idList,userId);
         try {
             ExcelUtil.writeExcelWithSheets(response, list, "贷审会数据一览表", "NO.1", new DgLoanCommitteeConsiderResponse())
                     .finish();

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java

@@ -105,10 +105,10 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl<DgLoanNoticeMapper, DgL
     }
 
     @Override
-    public void batchExport(HttpServletResponse response, String ids) throws IOException {
+    public void batchExport(HttpServletResponse response, String ids,Integer userId) throws IOException {
         String[] id = ids.split(",");
         List<String> idList = Arrays.asList(id);
-        List<LoanNoticeListResponse> excelDataList = baseMapper.selectBatchData(idList);
+        List<LoanNoticeListResponse> excelDataList = baseMapper.selectBatchData(idList, userId);
         EasyExcelUtil.download(response,LoanNoticeListResponse.class,excelDataList,"放款通知列表","第一页");
     }
 

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java

@@ -502,9 +502,9 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
     }
 
     @Override
-    public Boolean excelExport(List<String> ids, HttpServletResponse response) {
+    public Boolean excelExport(List<String> ids,Integer userId, HttpServletResponse response) {
         //根据ids查询业务申请列表信息
-        List<MessageInvestigationListResponse>messageList = this.baseMapper.selectListByIds(ids);
+        List<MessageInvestigationListResponse>messageList = this.baseMapper.selectListByIds(ids,userId);
         System.out.println("applyList==========================="+messageList);
         try {
             ExcelUtil.writeExcelWithSheets(response, messageList, "信息调查一览表", "messageInvestigation", new MessageInvestigationListResponse())

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java

@@ -98,10 +98,10 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
     }
 
     @Override
-    public void batchExport(HttpServletResponse response, String ids) throws IOException {
+    public void batchExport(HttpServletResponse response, String ids,Integer userId) throws IOException {
         String[] id = ids.split(",");
         List<String> idList = Arrays.asList(id);
-        List<PaymentConfirmationListResponse> excelDataList = baseMapper.selectBatchData(idList);
+        List<PaymentConfirmationListResponse> excelDataList = baseMapper.selectBatchData(idList,userId);
         EasyExcelUtil.download(response,PaymentConfirmationListResponse.class,excelDataList,"回款确认列表","第一页");
     }
 

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java

@@ -372,7 +372,7 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
      */
     @Transactional
     @Override
-    public Boolean excelExport(HttpServletResponse response, List<String> ids) {
+    public Boolean excelExport(HttpServletResponse response, List<String> ids,Integer userId) {
         if (ids == null || ids.size() == 0) {
             ExceptionCast.cast(GuaranteeCode.EXCEL_ID_NOT_NULL);
         }
@@ -380,7 +380,7 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
         for (String id : ids) {
             idList.add(Integer.parseInt(id));
         }
-        List<DgWorkConferencePO> list = this.getBaseMapper().excelList(idList);
+        List<DgWorkConferencePO> list = this.getBaseMapper().excelList(idList,userId);
         System.out.println(list);
         // 获取所有的userId
         Integer[] userIds = new Integer[list.size() * 5];

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountInfoMapper.xml

@@ -55,10 +55,17 @@
 /*        left join crms_company_customer ccl on ai.company_id = ccl.id
         left join crms_customer cc on cc.id = ccl.customer_id*/
         left JOIN dg_business_process_status ps ON ps.business_id = au.business_id
-        where au.id in
+        <where>
-        <foreach collection="list" close=")" open="(" item="id" separator=",">
+            <if test="userId != null and userId != ''">
-            #{id}
+                AND (au.emp_id =#{userId} or au.emp_id is null)
-        </foreach>
+            </if>
+            <if test="ids != null and ids.size>0">
+                AND au.id in
+                <foreach collection="ids" close=")" open="(" item="id" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+        </where>
     </select>
 
     <select id="queryApplyField" resultType="com.daqing.framework.domain.guarantee.DgApplyField">

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAssetsInvestigationMapper.xml

@@ -72,10 +72,17 @@
 /*        left join crms_company_customer ccl on ai.company_id = ccl.id
         left join crms_customer cc on cc.id = ccl.customer_id*/
         left JOIN dg_business_process_status ps ON ps.business_id = au.business_id
-        where au.id in
+        <where>
-        <foreach collection="list" close=")" open="(" item="id" separator=",">
+            <if test="userId != null and userId != ''">
-            #{id}
+                AND (au.emp_id =#{userId} or au.emp_id is null)
-        </foreach>
+            </if>
+            <if test="ids != null and ids.size>0">
+                AND au.id in
+                <foreach collection="ids" close=")" open="(" item="id" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+        </where>
     </select>
 
     <select id="selectAssetsList" resultType="com.daqing.financial.guarantee.model.response.DgNoticeListResponse">

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml

@@ -60,11 +60,18 @@
         ON c.id = cc.customer_id*/
         LEFT JOIN dg_business_process_status AS b
         ON b.business_id = a.id
-        WHERE /*c.del_or_not  = 0*/
+        <where>
-        /*AND*/ i.id IN
+            <if test="userId != null and userId != ''">
-        <foreach collection="ids" open="(" separator="," close=")" item="id">
+                AND (i.user_id =#{userId} or i.user_id is null)
-            #{id}
+            </if>
-        </foreach>
+            <if test="ids != null and ids.size>0">
+                AND /*c.del_or_not  = 0*/
+                /*AND*/ i.id IN
+                <foreach collection="ids" open="(" separator="," close=")" item="id">
+                    #{id}
+                </foreach>
+            </if>
+        </where>
         ORDER BY a.create_time DESC
     </select>
 

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml

@@ -55,10 +55,17 @@
 /*        left join crms_company_customer ccl on ai.company_id = ccl.id
         left join crms_customer cc on cc.id = ccl.customer_id*/
         left JOIN dg_business_process_status ps ON ps.business_id = au.business_id
-        where au.id in
+        <where>
-        <foreach collection="list" close=")" open="(" item="id" separator=",">
+            <if test="userId != null and userId != ''">
-            #{id}
+                AND (au.emp_id =#{userId} or au.emp_id is null)
-        </foreach>
+            </if>
+            <if test="ids != null and ids.size>0">
+                AND au.id in
+                <foreach collection="ids" close=")" open="(" item="id" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+        </where>
     </select>
 
     <!-- 改变所有业务id相同的审核状态,用于拒绝或者驳回 -->

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml

@@ -87,10 +87,17 @@
         left join crms_customer cc on ccc.customer_id = cc.id*/
         left join dg_loan_committee_consider lcc on lau.business_id = lcc.business_id
         left join dg_business_process_status bps on lau.business_id = bps.business_id
-        where lau.id in
+        <where>
-        <foreach collection="list" close=")" open="(" item="id" separator=",">
+            <if test="userId != null and userId != ''">
-            #{id}
+                AND (lau.user_id =#{userId} or lau.user_id is null)
-        </foreach>
+            </if>
+            <if test="ids != null and ids.size>0">
+                AND lau.id in
+                <foreach collection="ids" close=")" open="(" item="id" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+        </where>
     </select>
 
     <select id="selectGuaranteeLetter"

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml

@@ -62,11 +62,18 @@
         ON cc.customer_id = c.id*/
         LEFT JOIN dg_business_process_status AS b
         ON b.business_id = a.id
-        WHERE /*c.del_or_not = 0*/
+        <where>
-        /*AND*/ l.id IN
+            <if test="userId != null and userId != ''">
-        <foreach collection="ids" open="(" separator="," close=")" item="id">
+                AND (l.consider_id =#{userId} or l.consider_id is null)
-            #{id}
+            </if>
-        </foreach>
+            <if test="ids != null and ids.size>0">
+                AND /*c.del_or_not = 0*/
+                /*AND*/ l.id IN
+                <foreach collection="ids" open="(" separator="," close=")" item="id">
+                    #{id}
+                </foreach>
+            </if>
+        </where>
         ORDER BY a.create_time DESC
     </select>
 

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml

@@ -70,10 +70,17 @@
         left join crms_customer cc on ccc.customer_id = cc.id*/
         left join dg_loan_committee_consider lcc on ln.business_id = lcc.business_id
         left join dg_business_process_status bps on ln.business_id = bps.business_id
-        where ln.id in
+        <where>
-        <foreach collection="list" close=")" open="(" item="id" separator=",">
+            <if test="userId != null and userId != ''">
-            #{id}
+                AND (ln.consider_id =#{userId} or ln.consider_id is null)
-        </foreach>
+            </if>
+            <if test="ids != null and ids.size>0">
+                AND ln.id in
+                <foreach collection="ids" close=")" open="(" item="id" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+        </where>
     </select>
 
 

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgMessageInvestigationMapper.xml

@@ -54,10 +54,17 @@
 /*        left join crms_company_customer ccl on ai.company_id = ccl.id
         left join crms_customer cc on cc.id = ccl.customer_id*/
         left JOIN dg_business_process_status ps ON ps.business_id = au.business_id
-        where au.id in
+        <where>
-        <foreach collection="list" close=")" open="(" item="id" separator=",">
+            <if test="userId != null and userId != ''">
-            #{id}
+                AND (au.emp_id =#{userId} or au.emp_id is null)
-        </foreach>
+            </if>
+            <if test="ids != null and ids.size>0">
+                AND au.id in
+                <foreach collection="ids" close=")" open="(" item="id" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+        </where>
     </select>
 
     <select id="selectMessageList" resultType="com.daqing.financial.guarantee.model.response.DgNoticeListResponse">

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml

@@ -74,10 +74,17 @@
         left join crms_customer cc on ccc.customer_id = cc.id*/
         left join dg_loan_committee_consider lcc on pcc.business_id = lcc.business_id
         left join dg_business_process_status bps on pcc.business_id = bps.business_id
-        where pcc.id in
+        <where>
-        <foreach collection="list" close=")" open="(" item="id" separator=",">
+            <if test="userId != null and userId != ''">
-            #{id}
+                AND (pcc.consider_id =#{userId} or pcc.consider_id is null)
-        </foreach>
+            </if>
+            <if test="ids != null and ids.size>0">
+                AND pcc.id in
+                <foreach collection="ids" close=")" open="(" item="id" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+        </where>
     </select>
 
     <select id="selectPaymentConfirmationList" resultType="com.daqing.financial.guarantee.model.response.DgNoticeListResponse">

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgWorkConferenceConsiderMapper.xml

@@ -82,14 +82,21 @@
         ON a.id = ass.business_id
         LEFT JOIN dg_message_investigation AS m
         ON a.id = m.business_id
-        WHERE /*c.del_or_not = 0*/
+        <where>
-        /*AND*/ i.role_id = 70
+            <if test="userId != null and userId != ''">
-        AND ass.role_id = 64
+                AND (w.user_id =#{userId} or w.user_id is null)
-        AND m.role_id = 67
+            </if>
-        AND w.id IN
+            <if test="ids != null and ids.size>0">
-        <foreach collection="ids" open="(" separator="," close=")" item="id">
+                AND /*c.del_or_not = 0*/
-            #{id}
+                /*AND*/ i.role_id = 70
-        </foreach>
+                AND ass.role_id = 64
+                AND m.role_id = 67
+                AND w.id IN
+                <foreach collection="ids" open="(" separator="," close=")" item="id">
+                    #{id}
+                </foreach>
+            </if>
+        </where>
         ORDER BY a.create_time DESC
     </select>
 

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/handle/AdminAuthenticationSuccessHandler.java

@@ -32,6 +32,7 @@ public class AdminAuthenticationSuccessHandler implements AuthenticationSuccessH
         user.setAccount(securityUser.getCurrentUserInfo().getAccount());
         user.setToken(securityUser.getCurrentUserInfo().getToken());
         user.setHeadPortaritUrl(securityUser.getCurrentUserInfo().getHeadPortaritUrl());
+        user.setId(securityUser.getCurrentUserInfo().getId());
         ResponseUtils.out(response, ApiResult.ok("登录成功!", user));
     }
 

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserDetailsServiceImpl.java

@@ -65,17 +65,21 @@ public class UserDetailsServiceImpl implements UserDetailsService {
         List<UserEntity> userList2 = userMapper.selectList(new QueryWrapper<UserEntity>().eq("account", username));
         UserEntity user;
         String name = null;
+        Long userId;
         // 判断用户是否存在
         if (!CollectionUtils.isEmpty(userList)) {
             user = userList.get(0);
             name = userLoginDao.getNameByUserId(userList.get(0).getId());
+            userId = userList.get(0).getId();
         } else if(!CollectionUtils.isEmpty(userList2)){
             user = userList2.get(0);
             name = userLoginDao.getNameByUserId(userList2.get(0).getId());
+            userId = userList2.get(0).getId();
         } else {
             throw new UsernameNotFoundException("用户名不存在或已禁用！");
         }
         user.setAccount(name);
+        user.setId(userId);
         // 返回UserDetails实现类
         return new SecurityUser(user, getUserRoles(user.getId().intValue()));
     }

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java

@@ -261,6 +261,7 @@ public class UserLoginServiceImpl extends ServiceImpl<UserLoginDao, UserEntity>
 
         //返回用户信息
         LoginResponse loginResponse = new LoginResponse();
+        loginResponse.setId(userEntity.getId());
 
         if(name == null || name == ""){//名称如果为空，则代表是客户的名称，小程序端登录，名称默认为微信名称
             name = userEntity.getAccount();

dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/response/LoginResponse.java

@@ -5,6 +5,8 @@ import lombok.Data;
 
 @Data
 public class LoginResponse {
+    @ApiModelProperty(value = "用户id")
+    private Long id;
     @ApiModelProperty(value = "用户名")
     private String account;
     @ApiModelProperty("token令牌")