Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/billingapplicationAdd.vue

@@ -365,8 +365,10 @@ export default {
       }
       const choose = this.openTick_list.filter((item) => item.name === val)
       if (choose !== null && choose.length > 0) {
-        if (choose[0].openTickTypeValue !== this.formobj.openTickTypeValue) {
+        if (choose[0].openTickTypeValue !== this.formobj.openTickTypeValue && this.formobj.openTickTypeValue === '增值税专用发票') {
           this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符，请维护开票信息' })
+          this.formobj.openTickName = ''
+          this.formobj.openTickSid = ''
         } else {
           this.formobj.openTickSid = choose[0].sid
           if (this.formobj.finBillVehicles.length > 0) {
@@ -396,8 +398,11 @@ export default {
       }
       const choose = this.openTick_list.filter((item) => item.name === val)
       if (choose !== null && choose.length > 0) {
-        if (choose[0].openTickTypeValue !== row.billTypeValue) {
+        if (choose[0].openTickTypeValue !== row.billTypeValue && row.billTypeValue === '增值税专用发票') {
           this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符，请维护开票信息' })
+          row.openTickName = ''
+          row.openTickSid = ''
+          row.openTickRemarks = ''
         } else {
           row.openTickSid = choose[0].sid
           row.openTickRemarks = choose[0].openTickRemarks

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/kaipiaoAdd.vue

@@ -365,8 +365,10 @@ export default {
       }
       const choose = this.openTick_list.filter((item) => item.name === val)
       if (choose !== null && choose.length > 0) {
-        if (choose[0].openTickTypeValue !== this.formobj.openTickTypeValue) {
+        if (choose[0].openTickTypeValue !== this.formobj.openTickTypeValue && this.formobj.openTickTypeValue === '增值税专用发票') {
           this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符，请维护开票信息' })
+          this.formobj.openTickName = ''
+          this.formobj.openTickSid = ''
         } else {
           this.formobj.openTickSid = choose[0].sid
           if (this.formobj.finBillVehicles.length > 0) {
@@ -396,8 +398,11 @@ export default {
       }
       const choose = this.openTick_list.filter((item) => item.name === val)
       if (choose !== null && choose.length > 0) {
-        if (choose[0].openTickTypeValue !== row.billTypeValue) {
+        if (choose[0].openTickTypeValue !== row.billTypeValue && row.billTypeValue === '增值税专用发票') {
           this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符，请维护开票信息' })
+          row.openTickName = ''
+          row.openTickSid = ''
+          row.openTickRemarks = ''
         } else {
           row.openTickSid = choose[0].sid
           row.openTickRemarks = choose[0].openTickRemarks

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue

@@ -502,8 +502,10 @@ export default {
       }
       const choose = this.openTick_list.filter((item) => item.name === val)
       if (choose !== null && choose.length > 0) {
-        if (choose[0].openTickTypeValue !== this.formobj.openTickTypeValue) {
+        if (choose[0].openTickTypeValue !== this.formobj.openTickTypeValue && this.formobj.openTickTypeValue === '增值税专用发票') {
           this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符，请维护开票信息' })
+          this.formobj.openTickName = ''
+          this.formobj.openTickSid = ''
         } else {
           this.formobj.openTickSid = choose[0].sid
           if (this.formobj.finBillVehicles.length > 0) {
@@ -533,8 +535,11 @@ export default {
       }
       const choose = this.openTick_list.filter((item) => item.name === val)
       if (choose !== null && choose.length > 0) {
-        if (choose[0].openTickTypeValue !== row.billTypeValue) {
+        if (choose[0].openTickTypeValue !== row.billTypeValue && row.billTypeValue === '增值税专用发票') {
           this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符，请维护开票信息' })
+          row.openTickName = ''
+          row.openTickSid = ''
+          row.openTickRemarks = ''
         } else {
           row.openTickSid = choose[0].sid
           row.openTickRemarks = choose[0].openTickRemarks

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapplyAdd.vue

@@ -462,8 +462,10 @@ export default {
       }
       const choose = this.openTick_list.filter((item) => item.name === val)
       if (choose !== null && choose.length > 0) {
-        if (choose[0].openTickTypeValue !== this.formobj.openTickTypeValue) {
+        if (choose[0].openTickTypeValue !== this.formobj.openTickTypeValue && this.formobj.openTickTypeValue === '增值税专用发票') {
           this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符，请维护开票信息' })
+          this.formobj.openTickName = ''
+          this.formobj.openTickSid = ''
         } else {
           this.formobj.openTickSid = choose[0].sid
           if (this.formobj.finBillVehicles.length > 0) {
@@ -493,8 +495,11 @@ export default {
       }
       const choose = this.openTick_list.filter((item) => item.name === val)
       if (choose !== null && choose.length > 0) {
-        if (choose[0].openTickTypeValue !== row.billTypeValue) {
+        if (choose[0].openTickTypeValue !== row.billTypeValue && row.billTypeValue === '增值税专用发票') {
           this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符，请维护开票信息' })
+          row.openTickName = ''
+          row.openTickSid = ''
+          row.openTickRemarks = ''
         } else {
           row.openTickSid = choose[0].sid
           row.openTickRemarks = choose[0].openTickRemarks

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyEdit.vue

@@ -483,8 +483,10 @@ export default {
       }
       const choose = this.openTick_list.filter((item) => item.name === val)
       if (choose !== null && choose.length > 0) {
-        if (choose[0].openTickTypeValue !== this.formobj.openTickTypeValue) {
+        if (choose[0].openTickTypeValue !== this.formobj.openTickTypeValue && this.formobj.openTickTypeValue === '增值税专用发票') {
           this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符，请维护开票信息' })
+          this.formobj.openTickName = ''
+          this.formobj.openTickSid = ''
         } else {
           this.formobj.openTickSid = choose[0].sid
           if (this.formobj.finBillVehicles.length > 0) {
@@ -514,8 +516,11 @@ export default {
       }
       const choose = this.openTick_list.filter((item) => item.name === val)
       if (choose !== null && choose.length > 0) {
-        if (choose[0].openTickTypeValue !== row.billTypeValue) {
+        if (choose[0].openTickTypeValue !== row.billTypeValue && row.billTypeValue === '增值税专用发票') {
           this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符，请维护开票信息' })
+          row.openTickName = ''
+          row.openTickSid = ''
+          row.openTickRemarks = ''
         } else {
           row.openTickSid = choose[0].sid
           row.openTickRemarks = choose[0].openTickRemarks

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingEdit.vue

@@ -475,8 +475,10 @@ export default {
       }
       const choose = this.openTick_list.filter((item) => item.name === val)
       if (choose !== null && choose.length > 0) {
-        if (choose[0].openTickTypeValue !== this.formobj.openTickTypeValue) {
+        if (choose[0].openTickTypeValue !== this.formobj.openTickTypeValue && this.formobj.openTickTypeValue === '增值税专用发票') {
           this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符，请维护开票信息' })
+          this.formobj.openTickName = ''
+          this.formobj.openTickSid = ''
         } else {
           this.formobj.openTickSid = choose[0].sid
           if (this.formobj.finBillVehicles.length > 0) {
@@ -506,8 +508,11 @@ export default {
       }
       const choose = this.openTick_list.filter((item) => item.name === val)
       if (choose !== null && choose.length > 0) {
-        if (choose[0].openTickTypeValue !== row.billTypeValue) {
+        if (choose[0].openTickTypeValue !== row.billTypeValue && row.billTypeValue === '增值税专用发票') {
           this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符，请维护开票信息' })
+          row.openTickName = ''
+          row.openTickSid = ''
+          row.openTickRemarks = ''
         } else {
           row.openTickSid = choose[0].sid
           row.openTickRemarks = choose[0].openTickRemarks

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java

@@ -1342,7 +1342,7 @@ public class LoanCustomerRecordService extends MybatisBaseService<LoanCustomerRe
     public ResultBean<String> saveCustomerRecord(AppCustomerRecordDto dto) {
         ResultBean rb = ResultBean.fireFail();
         if (StringUtils.isBlank(dto.getIdNumber())) {
-            return rb.setMsg("证件号码不能为空！");
+            return rb.fail().setMsg("证件号码不能为空！");
         }
         String sid = "";
 //        企业开票人员信息
@@ -1641,8 +1641,8 @@ public class LoanCustomerRecordService extends MybatisBaseService<LoanCustomerRe
         //若有网关，则赋值网关中判断的字段。
         boolean isTure = true;
         //去查询是否同意
-        if (StringUtils.isNotBlank(loanCustomerRecord.getSalesUserSid())) {
-            if (!loanCustomerRecord.getCreateBySid().equals(loanCustomerRecord.getSalesUserSid())) {
+        if (StringUtils.isNotBlank(entity.getSalesUserSid())) {
+            if (!entity.getCreateBySid().equals(entity.getSalesUserSid())) {
                 isTure = false;
             }
         }