Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml

@@ -903,12 +903,15 @@
                 d.period,
                 h.actualDate,
                 h.actualMoney,
-                h.returnWay
+                h.returnWay,
+                fj.payCostTitleValue AS kxType
         FROM
                 loan_repayment_history h
                         LEFT JOIN loan_repayment_plan_details d
                         ON h.planDetailSid = d.sid
                                 AND h.scheduleSid = d.scheduleSid
+                        LEFT JOIN anrui_fin.fin_uncollected_receivables_detailed_jr fj
+                        ON d.sid = fj.`busSid`
         WHERE d.vinNo = #{vinNo}
           AND h.scheduleSid = #{scheduleSid}
     </select>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@@ -7055,7 +7055,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         AppRepaymentHistoryThead appRepaymentHistoryThead2 = new AppRepaymentHistoryThead();
         appRepaymentHistoryThead2.setName("kxType");
         appRepaymentHistoryThead2.setLabel("款项类别");
-        appRepaymentHistoryThead2.setWidth("80");
+        appRepaymentHistoryThead2.setWidth("120");
         appRepaymentHistoryThead2.setEmptyString("-");
         appRepaymentHistoryThead2.setAlign("center");
         appRepaymentHistoryTheads.add(appRepaymentHistoryThead2);

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeService.java

@@ -76,7 +76,6 @@ public class BaseSupplierTypeService extends MybatisBaseService<BaseSupplierType
 	public ResultBean saveOrUpdateDto(BaseSupplierTypeDto dto){
 		ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
-		if (StringUtils.isBlank(dtoSid)) {
 		String deptName = "";
 		String deptSid = "";
 		String createOrgSid = "";
@@ -105,6 +104,7 @@ public class BaseSupplierTypeService extends MybatisBaseService<BaseSupplierType
 				dto.setCreateOrgName(organizationResultBean.getData().getName());
 			}
 		}
+		if (StringUtils.isBlank(dtoSid)) {
 			int i = baseMapper.checkSaveCode(dto.getSupplierTypeCode(),dto.getUseOrgSid());
 			if (i > 0){
 				return rb.setMsg("新增编码已存在，请重新输入");