解决小bug

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/GuaranteeLetterQueryRequest.java

@@ -13,7 +13,7 @@ import lombok.Data;
 public class GuaranteeLetterQueryRequest {
 
     @ApiModelProperty(value = "当前页码,默认为第一页")
-    private Integer page = 1;
+    private Integer page = 0;
 
     @ApiModelProperty(value = "每页记录数,默认显示10条")
     private Integer size = 10;

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/LoanNoticeQueryRequest.java

@@ -15,7 +15,7 @@ import javax.validation.constraints.NotNull;
 public class LoanNoticeQueryRequest {
 
     @ApiModelProperty(value = "当前页码,默认为第一页")
-    private Integer page = 1;
+    private Integer page = 0;
 
     @ApiModelProperty(value = "每页记录数,默认显示10条")
     private Integer size = 10;

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/PaymentConfirmationQueryRequest.java

@@ -15,7 +15,7 @@ import javax.validation.constraints.NotNull;
 public class PaymentConfirmationQueryRequest {
 
     @ApiModelProperty(value = "当前页码,默认为第一页")
-    private Integer page = 1;
+    private Integer page = 0;
 
     @ApiModelProperty(value = "每页记录数,默认显示10条")
     private Integer size = 10;

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeLetterListResponse.java

@@ -32,6 +32,10 @@ public class GuaranteeLetterListResponse {
     @ApiModelProperty("唯一标识")
     private Integer id;
 
+    @ExcelIgnore
+    @ApiModelProperty("角色id")
+    private Integer roleId;
+
     @ExcelIgnore
     @ApiModelProperty("银行名称")
     private String bank;

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

@@ -100,7 +100,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
             List<GuaranteeLetterListResponse> records = guaranteeLetterVO.getRecords();
             records.forEach(guaranteeLetterListResponse -> {
                 //角色为法规部经理则设置值
-                if (roleIdList.contains(String.valueOf(PromptSuccess.FG_JL_ID))){
+                if (guaranteeLetterListResponse.getRoleId().equals(PromptSuccess.FG_JL_ID)){
                     guaranteeLetterListResponse.setIsFgJl(1);
                 }
             });

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

@@ -30,11 +30,12 @@
         <result column="operating_status" property="operatingStatus" />
         <result column="business_status" property="businessStatus" />
         <result column="business_id" property="businessId" />
+        <result column="role_id" property="roleId" />
     </resultMap>
 
     <select id="pageByCondition" resultMap="GuaranteeLetterListResponseMap">
-        select lau.id,aai.business_code,cc.name,cc.phone,aai.business_type,lcc.loan_money,lcc.loan_tern,aai.create_time,
+        select lau.id,aai.business_code,cc.name,cc.phone,aai.business_type,lcc.loan_money,lcc.loan_tern,aai.create_time,lau.status,
-        lau.status,aai.bank,lcc.passing_time,lcc.file,lau.audit_opinion,lau.operating_status,bps.business_status,lau.business_id
+        aai.bank,lcc.passing_time,lcc.file,lau.audit_opinion,lau.operating_status,bps.business_status,lau.business_id,lau.role_id
         from dg_guarantee_letter_assign_user lau
         left join dg_apply_amount_info aai on lau.business_id = aai.id
         left join crms_company_customer ccc on lau.company_id = ccc.id
@@ -47,7 +48,7 @@
                 #{id}
             </foreach>
             <if test="userId != null and userId != ''">
-                AND (lau.user_id = #{userId} or lau.user_id is null)
+                AND (lau.user_id = #{userId} or lau.user_id is null OR lau.user_id = '')
             </if>
             <if test="customerNumberOrName != null and customerNumberOrName != ''">
                 AND aai.business_code LIKE CONCAT('%',#{customerNumberOrName},'%') OR cc.name LIKE CONCAT('%',#{customerNumberOrName},'%')

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

@@ -45,7 +45,7 @@
                 #{id}
             </foreach>
             <if test="userId != null and userId != ''">
-                AND (ln.consider_id = #{userId} or ln.consider_id is null)
+                AND (ln.consider_id = #{userId} or ln.consider_id is null OR ln.consider_id = '')
             </if>
             <if test="customerNumberOrName != null and customerNumberOrName != ''">
                 AND aai.business_code LIKE CONCAT('%',#{customerNumberOrName},'%') OR cc.name LIKE CONCAT('%',#{customerNumberOrName},'%')

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

@@ -49,7 +49,7 @@
                 #{id}
             </foreach>
             <if test="userId != null and userId != ''">
-                AND (pcc.consider_id = #{userId} or pcc.consider_id is null)
+                AND (pcc.consider_id = #{userId} or pcc.consider_id is null OR pcc.consider_id = '')
             </if>
             <if test="customerNumberOrName != null and customerNumberOrName != ''">
                 AND aai.business_code LIKE CONCAT('%',#{customerNumberOrName},'%') OR cc.name LIKE CONCAT('%',#{customerNumberOrName},'%')

dq-govern-gateway/src/main/resources/jwt.properties

@@ -23,7 +23,8 @@ jwt.ignoreUrlList=/apiHrmsAuth/hrms/auth/userlogin/getBackPwd,\
   /api-guarantee/dg-guarantee-letter-assign-user/exportGuaranteeLetter,\
   /api-guarantee/dg-guarantee-letter-assign-user/guaranteeLetterListExport,\
   /api-guarantee/dg-payment-confirmation-consider/paymentConfirmationListExport,\
-  /api-guarantee/dg-loan-notice/loanNoticeListExport
+  /api-guarantee/dg-loan-notice/loanNoticeListExport,\
+  /api-guarantee/dg-loan-notice/exportLoanNotice