diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java index 88d116c4..6d2ad01e 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java +++ b/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 ids,HttpServletResponse response) { + public ResponseResult excelExport(@RequestParam("ids") List 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(); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsInvestigationController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsInvestigationController.java index c5d9737f..b44cce6a 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsInvestigationController.java +++ b/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 ids, HttpServletResponse response) { + public ResponseResult excelExport(@RequestParam("ids") List 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(); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java index ac5240b3..92c95ef7 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java +++ b/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 ids) { - Boolean result = iDgComplianceInvestigationService.excelExport(response, ids); + public ResponseResult query(HttpServletResponse response, @RequestParam("ids") List ids,@RequestParam("userId")Integer userId) { + Boolean result = iDgComplianceInvestigationService.excelExport(response, ids,userId); return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); } } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java index 0d861686..2d2fec5a 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java +++ b/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 ids, HttpServletResponse response) { + public ResponseResult excelExport(@RequestParam("ids") List 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(); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java index 648c2164..1728137b 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java +++ b/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(); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanCommitteeConsiderController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanCommitteeConsiderController.java index b7d12990..f6913304 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanCommitteeConsiderController.java +++ b/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 ids) { - Boolean result = dgLoanCommitteeConsiderService.excelExport(response, ids); + public ResponseResult excelExport(HttpServletResponse response, @RequestParam("ids") List ids,@RequestParam("userId")Integer userId) { + Boolean result = dgLoanCommitteeConsiderService.excelExport(response, ids,userId); return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); } } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java index 2e8b5064..2af9ec3f 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java +++ b/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(); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgMessageInvestigationController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgMessageInvestigationController.java index 6fb48b25..deae8b87 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgMessageInvestigationController.java +++ b/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 ids, HttpServletResponse response) { + public ResponseResult excelExport(@RequestParam("ids") List 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(); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java index 53df6bac..b99f3ae6 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java +++ b/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(); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgWorkConferenceConsiderController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgWorkConferenceConsiderController.java index 15148ec9..a2a8411e 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgWorkConferenceConsiderController.java +++ b/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 ids){ - Boolean result = dgWorkConferenceConsiderService.excelExport(response, ids); + public ResponseResult excelExport(HttpServletResponse response, @RequestParam("ids") List ids,@RequestParam("userId")Integer userId){ + Boolean result = dgWorkConferenceConsiderService.excelExport(response, ids,userId); return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); } } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountInfoMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountInfoMapper.java index 89e26148..9adc2b82 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountInfoMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountInfoMapper.java @@ -30,7 +30,7 @@ public interface DgApplyAmountInfoMapper extends BaseMapper { DgApplyAmountInfoResponse selectApplyAmountInfoById(Integer id); - List selectListByIds(List ids); + List selectListByIds(@Param("ids")List ids,@Param("userId") Integer userId); DgApplyField queryApplyField(); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgAssetsInvestigationMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgAssetsInvestigationMapper.java index ef444725..c9f727fa 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgAssetsInvestigationMapper.java +++ b/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 selectListByIds(List ids); + List selectListByIds(@Param("ids") List ids, @Param("userId") Integer userId); List selectAssetsList(String userId, List roleIdlist); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java index cb8a9a2f..9a15833e 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java @@ -29,7 +29,7 @@ public interface DgComplianceInvestigationMapper extends BaseMapper list(Page page, @Param("cr") DgComplianceInvestigationRequest dgComplianceInvestigationRequest, @Param("roleIds") List roleIds, @Param("userId") Integer userId); - List listExcel(@Param("ids") List ids); + List listExcel(@Param("ids") List 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, diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeAssignUserMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeAssignUserMapper.java index 0a031c5d..58e4dae0 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeAssignUserMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeAssignUserMapper.java @@ -24,7 +24,7 @@ public interface DgGuaranteeAssignUserMapper extends BaseMapper pageByCondition(Page page,@Param("customerNumberOrName") String customerNumberOrName,@Param("roleIdlist") List roleIdlist,@Param("userId") String userId,@Param("status") Integer status); - List selectListByIds(List ids); + List selectListByIds(@Param("ids") List ids,@Param("userId") Integer userId); Boolean updateAuditStatusByBusinessId(@Param("businessId") Integer businessId, @Param("auditStatus") Integer auditStatus); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeLetterAssignUserMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeLetterAssignUserMapper.java index b28ee45d..ceb0a4d9 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeLetterAssignUserMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeLetterAssignUserMapper.java @@ -25,7 +25,7 @@ public interface DgGuaranteeLetterAssignUserMapper extends BaseMapper pageByCondition(Page page, Integer userId, List roleIdList, Integer status, String customerNumberOrName); - List selectBatchData(List idList); + List selectBatchData(@Param("ids") List idList,@Param("userId")Integer userId); GuaranteeLetterListResponse selectGuaranteeLetter(String businessId,String roleId); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java index e8e29d91..937272b1 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java @@ -30,7 +30,7 @@ public interface DgLoanCommitteeConsiderMapper extends BaseMapper list(Page page, @Param("codeOrName") String codeOrName, @Param("roleIds") List roleIds, @Param("userId") Integer userId,@Param("status") Integer status); - List excelList(@Param("ids") List ids); + List excelList(@Param("ids") List 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); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanNoticeMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanNoticeMapper.java index 75ff5f08..44757675 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanNoticeMapper.java +++ b/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 { IPage pageByCondition(Page page, List roleIdList, Integer userId, Integer status, String customerNumberOrName); - List selectBatchData(List idList); + List selectBatchData(@Param("ids") List idList,@Param("userId")Integer userId); LoanNoticeListResponse selectLoanNotice(String businessId, String roleId); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgMessageInvestigationMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgMessageInvestigationMapper.java index 7138082c..c33c8e04 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgMessageInvestigationMapper.java +++ b/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 pageByCondition(Page page, String customerNumberOrName, List roleIdlist, String userId, Integer status); - List selectListByIds(List ids); + List selectListByIds(@Param("ids") List ids, @Param("userId")Integer userId); List selectMessageList(String userId, List roleIdlist); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgPaymentConfirmationConsiderMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgPaymentConfirmationConsiderMapper.java index cd0902e5..a7ad7379 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgPaymentConfirmationConsiderMapper.java +++ b/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 pageByCondition(Page page, List roleIdList , Integer userId , Integer status, String customerNumberOrName); - List selectBatchData(List idList); + List selectBatchData(@Param("ids") List idList,@Param("userId")Integer userId); List selectPaymentConfirmationList(String userId, List roleIdlist); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgWorkConferenceConsiderMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgWorkConferenceConsiderMapper.java index bd2d4fe4..1d1cd33c 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgWorkConferenceConsiderMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgWorkConferenceConsiderMapper.java @@ -27,7 +27,7 @@ public interface DgWorkConferenceConsiderMapper extends BaseMapper list(Page page, @Param("codeOrName") String codeOrName, @Param("roleIds") List roleIds, @Param("userId") Integer userId, @Param("status") Integer status); - List excelList(@Param("ids") List ids); + List excelList(@Param("ids") List 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, diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgApplyAmountInfoService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgApplyAmountInfoService.java index 30f9e0bb..ed0617ac 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgApplyAmountInfoService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgApplyAmountInfoService.java @@ -30,7 +30,7 @@ public interface IDgApplyAmountInfoService extends IService { int revokeBusinessApplication(Integer id); - Boolean excelExport(List ids,HttpServletResponse response); + Boolean excelExport(List ids,Integer userId,HttpServletResponse response); int approvalBusinessApplication(Integer id, Integer status, String remark, Integer companyId); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgAssetsInvestigationService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgAssetsInvestigationService.java index 657fe5b4..679db7ff 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgAssetsInvestigationService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgAssetsInvestigationService.java @@ -32,5 +32,5 @@ public interface IDgAssetsInvestigationService extends IService ids, HttpServletResponse response); + Boolean excelExport(List ids, Integer userId, HttpServletResponse response); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgComplianceInvestigationService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgComplianceInvestigationService.java index 33b0647f..fdd12cfa 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgComplianceInvestigationService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgComplianceInvestigationService.java @@ -29,7 +29,7 @@ public interface IDgComplianceInvestigationService extends IService ids); + Boolean excelExport(HttpServletResponse response, List ids,Integer userId); String getFileUrl(String[] fileUrls); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgGuaranteeAssignUserService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgGuaranteeAssignUserService.java index 606889df..cb43624b 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgGuaranteeAssignUserService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgGuaranteeAssignUserService.java @@ -30,7 +30,7 @@ public interface IDgGuaranteeAssignUserService extends IService ids, HttpServletResponse response); + Boolean excelExport(List ids, Integer userId, HttpServletResponse response); ResponseResult assignCorners(GuaranteeRequest guaranteeRequest); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgGuaranteeLetterAssignUserService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgGuaranteeLetterAssignUserService.java index 821393c6..2029e62e 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgGuaranteeLetterAssignUserService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgGuaranteeLetterAssignUserService.java @@ -28,7 +28,7 @@ public interface IDgGuaranteeLetterAssignUserService extends IService ids); + Boolean excelExport(HttpServletResponse response, List ids,Integer userId); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgLoanNoticeService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgLoanNoticeService.java index 2363b78f..c093a4cd 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgLoanNoticeService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgLoanNoticeService.java @@ -26,7 +26,7 @@ public interface IDgLoanNoticeService extends IService { 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); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgMessageInvestigationService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgMessageInvestigationService.java index 57b4507d..dbe018c9 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgMessageInvestigationService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgMessageInvestigationService.java @@ -32,5 +32,5 @@ public interface IDgMessageInvestigationService extends IService ids, HttpServletResponse response); + Boolean excelExport(List ids,Integer userId, HttpServletResponse response); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgPaymentConfirmationConsiderService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgPaymentConfirmationConsiderService.java index 9c21503e..c2cd5fc9 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgPaymentConfirmationConsiderService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgPaymentConfirmationConsiderService.java @@ -25,7 +25,7 @@ public interface IDgPaymentConfirmationConsiderService extends IService ids); + Boolean excelExport(HttpServletResponse response, List ids,Integer userId); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java index e0fcb6c4..afb8281f 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java @@ -561,9 +561,9 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl ids, HttpServletResponse response) { + public Boolean excelExport(List ids, Integer userId, HttpServletResponse response) { //根据ids查询业务申请列表信息 - ListapplyList = this.baseMapper.selectListByIds(ids); + ListapplyList = this.baseMapper.selectListByIds(ids,userId); System.out.println("applyList==========================="+applyList); if(applyList != null){ if(applyList.size()>0){ diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java index 2cedfa26..db978d68 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java @@ -534,9 +534,9 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl ids, HttpServletResponse response) { + public Boolean excelExport(List ids,Integer userId, HttpServletResponse response) { //根据ids查询业务申请列表信息 - ListassetsList = this.baseMapper.selectListByIds(ids); + ListassetsList = this.baseMapper.selectListByIds(ids,userId); try { ExcelUtil.writeExcelWithSheets(response, assetsList, "资产调查一览表", "assetsInvestigation", new AssetsInvestigationListResponse()) .finish(); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java index 8b6498e3..7a7a8a3c 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java @@ -566,7 +566,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl ids) { + public Boolean excelExport(HttpServletResponse response, List 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 list = this.getBaseMapper().listExcel(idList); + List list = this.getBaseMapper().listExcel(idList,userId); try { ExcelUtil.writeExcelWithSheets(response, list, "合规调查数据一览表", "NO.1", new DgComplianceInvestigationResponse()) .finish(); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java index 1daf2058..d68b13d0 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java @@ -762,9 +762,9 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl ids, HttpServletResponse response) { + public Boolean excelExport(List ids, Integer userId, HttpServletResponse response) { //根据ids查询业务申请列表信息 - List guaranteeList = this.baseMapper.selectListByIds(ids); + List guaranteeList = this.baseMapper.selectListByIds(ids,userId); System.out.println("applyList===========================" + guaranteeList); try { ExcelUtil.writeExcelWithSheets(response, guaranteeList, "担保调查一览表", "businessApplication", new GuaranteeListResponse()) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java index 4502d181..129fbac6 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java @@ -86,10 +86,10 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl idList = Arrays.asList(id); - List excelDataList = baseMapper.selectBatchData(idList); + List excelDataList = baseMapper.selectBatchData(idList,userId); EasyExcelUtil.download(response,GuaranteeLetterListResponse.class,excelDataList,"担保函列表","第一页"); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java index f2b1916c..15f93fbf 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java +++ b/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 ids) { + public Boolean excelExport(HttpServletResponse response, List 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 list = this.getBaseMapper().excelList(idList); + List list = this.getBaseMapper().excelList(idList,userId); try { ExcelUtil.writeExcelWithSheets(response, list, "贷审会数据一览表", "NO.1", new DgLoanCommitteeConsiderResponse()) .finish(); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java index eb4c57d0..ad7f568c 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java @@ -105,10 +105,10 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl idList = Arrays.asList(id); - List excelDataList = baseMapper.selectBatchData(idList); + List excelDataList = baseMapper.selectBatchData(idList, userId); EasyExcelUtil.download(response,LoanNoticeListResponse.class,excelDataList,"放款通知列表","第一页"); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java index 44cabbf0..ce2b9ae8 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java @@ -502,9 +502,9 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl ids, HttpServletResponse response) { + public Boolean excelExport(List ids,Integer userId, HttpServletResponse response) { //根据ids查询业务申请列表信息 - ListmessageList = this.baseMapper.selectListByIds(ids); + ListmessageList = this.baseMapper.selectListByIds(ids,userId); System.out.println("applyList==========================="+messageList); try { ExcelUtil.writeExcelWithSheets(response, messageList, "信息调查一览表", "messageInvestigation", new MessageInvestigationListResponse()) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java index dc1048bd..fc6a71b1 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java @@ -98,10 +98,10 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl idList = Arrays.asList(id); - List excelDataList = baseMapper.selectBatchData(idList); + List excelDataList = baseMapper.selectBatchData(idList,userId); EasyExcelUtil.download(response,PaymentConfirmationListResponse.class,excelDataList,"回款确认列表","第一页"); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java index bbeb9ed1..57f6f8c1 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java @@ -372,7 +372,7 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl ids) { + public Boolean excelExport(HttpServletResponse response, List 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 list = this.getBaseMapper().excelList(idList); + List list = this.getBaseMapper().excelList(idList,userId); System.out.println(list); // 获取所有的userId Integer[] userIds = new Integer[list.size() * 5]; diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountInfoMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountInfoMapper.xml index 9a7a761c..4d6f4cb5 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountInfoMapper.xml +++ b/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 - - #{id} - + + + AND (au.emp_id =#{userId} or au.emp_id is null) + + + AND au.id in + + #{id} + + + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml index 3d3e404a..357b9936 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml +++ b/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 - - #{id} - + + + AND (au.emp_id =#{userId} or au.emp_id is null) + + + AND au.id in + + #{id} + + + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml index 2a6d251f..908086bc 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml +++ b/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 - - #{id} - + + + AND (lau.user_id =#{userId} or lau.user_id is null) + + + AND lau.id in + + #{id} + + + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml index 55b189b9..e6c0d142 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml +++ b/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 - - #{id} - + + + AND (ln.consider_id =#{userId} or ln.consider_id is null) + + + AND ln.id in + + #{id} + + + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgMessageInvestigationMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgMessageInvestigationMapper.xml index f3240ef4..21c5d65a 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgMessageInvestigationMapper.xml +++ b/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 - - #{id} - + + + AND (au.emp_id =#{userId} or au.emp_id is null) + + + AND au.id in + + #{id} + + + diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/handle/AdminAuthenticationSuccessHandler.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/handle/AdminAuthenticationSuccessHandler.java index a62928da..13ec4120 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/handle/AdminAuthenticationSuccessHandler.java +++ b/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)); } diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserDetailsServiceImpl.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserDetailsServiceImpl.java index f08f38fb..201ee838 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserDetailsServiceImpl.java +++ b/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 userList2 = userMapper.selectList(new QueryWrapper().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())); } diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java index 04b9f1e9..b9cda43f 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java @@ -261,6 +261,7 @@ public class UserLoginServiceImpl extends ServiceImpl //返回用户信息 LoginResponse loginResponse = new LoginResponse(); + loginResponse.setId(userEntity.getId()); if(name == null || name == ""){//名称如果为空,则代表是客户的名称,小程序端登录,名称默认为微信名称 name = userEntity.getAccount(); diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/response/LoginResponse.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/response/LoginResponse.java index d3e4ca07..91ddff16 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/response/LoginResponse.java +++ b/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令牌")