From a7af6de58c7273a23865afa436c7d3a42110defe Mon Sep 17 00:00:00 2001
From: shijie <648688341@qq.com>
Date: Fri, 2 Apr 2021 09:34:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=84=E4=BB=B6=E8=BF=94=E5=9B=9E=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DgApplyAmountInfoServiceImpl.java    | 47 +++++++------------
 .../DgGuaranteeAssignUserServiceImpl.java     | 19 ++------
 .../DgMessageInvestigationServiceImpl.java    | 19 ++------
 .../mapper/hrauth/RolePermissionMapper.xml    |  2 +-
 4 files changed, 24 insertions(+), 63 deletions(-)

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 2470a901..855a70d9 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
@@ -253,33 +253,33 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
 
     public void getEnclosure(BusinessApplicationRequest businessApplication,DgEnclosureInfo dgEnclosureInfo){
         //上传附件信息
-        if(businessApplication.getBusinessLicense()!=null)
+//        if(businessApplication.getBusinessLicense()!=null)
             dgEnclosureInfo.setBusinessLicense(ArraysUtil.toString(businessApplication.getBusinessLicense()));//营业执照复印件
-        if(businessApplication.getLegalCardCopy()!=null)
+//        if(businessApplication.getLegalCardCopy()!=null)
             dgEnclosureInfo.setLegalCardCopy(ArraysUtil.toString(businessApplication.getLegalCardCopy()));//上传法定代表人夫妻及企业实际经营者身份证复印件
-        if(businessApplication.getMarriageCopy()!=null)
+//        if(businessApplication.getMarriageCopy()!=null)
             dgEnclosureInfo.setMarriageCopy(ArraysUtil.toString(businessApplication.getMarriageCopy()));//法定代表人夫妻户口本，结婚证（离婚证）复印件
-        if(businessApplication.getLegalCopy()!=null)
+//        if(businessApplication.getLegalCopy()!=null)
             dgEnclosureInfo.setLegalCopy(ArraysUtil.toString(businessApplication.getLegalCopy()));//法定代表人身份证明
-        if(businessApplication.getCompanyConstitution()!=null)
+//        if(businessApplication.getCompanyConstitution()!=null)
             dgEnclosureInfo.setCompanyConstitution(ArraysUtil.toString(businessApplication.getCompanyConstitution()));//公司章程
-        if(businessApplication.getAccountingFirm()!=null)
+//        if(businessApplication.getAccountingFirm()!=null)
             dgEnclosureInfo.setAccountingFirm(ArraysUtil.toString(businessApplication.getAccountingFirm()));//会计师事务所审计的上一年度及本年度审计报告
-        if(businessApplication.getCompanyCredit()!=null)
+//        if(businessApplication.getCompanyCredit()!=null)
             dgEnclosureInfo.setCompanyCredit(ArraysUtil.toString(businessApplication.getCompanyCredit()));//企业信用报告
-        if(businessApplication.getCreditReport()!=null)
+//        if(businessApplication.getCreditReport()!=null)
             dgEnclosureInfo.setCreditReport(ArraysUtil.toString(businessApplication.getCreditReport()));//企业法人夫妇信用报告，实际经营者信用报告
-        if(businessApplication.getCertificateAuthorization()!=null)
+//        if(businessApplication.getCertificateAuthorization()!=null)
             dgEnclosureInfo.setCertificateAuthorization(ArraysUtil.toString(businessApplication.getCertificateAuthorization()));//征信业务授权书，承诺书
-        if(businessApplication.getTaxCertificate()!=null)
+//        if(businessApplication.getTaxCertificate()!=null)
             dgEnclosureInfo.setTaxCertificate(ArraysUtil.toString(businessApplication.getTaxCertificate()));//增值税纳税申报表首表复印件/完税证明
-        if(businessApplication.getMeetingMinutes()!=null)
+//        if(businessApplication.getMeetingMinutes()!=null)
             dgEnclosureInfo.setMeetingMinutes(ArraysUtil.toString(businessApplication.getMeetingMinutes()));//股东会会议纪要
-        if(businessApplication.getAssessmentReport()!=null)
+//        if(businessApplication.getAssessmentReport()!=null)
             dgEnclosureInfo.setAssessmentReport(ArraysUtil.toString(businessApplication.getAssessmentReport()));//反担保资料和评估报告
-        if(businessApplication.getConversationSummary()!=null)
+//        if(businessApplication.getConversationSummary()!=null)
             dgEnclosureInfo.setConversationSummary(ArraysUtil.toString(businessApplication.getConversationSummary()));
-        if(businessApplication.getInspectionPhotos()!=null)
+//        if(businessApplication.getInspectionPhotos()!=null)
             dgEnclosureInfo.setInspectionPhotos(ArraysUtil.toString(businessApplication.getInspectionPhotos()));
 
     }
@@ -353,36 +353,23 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
                 arr1List2.add(i,null);
             }
         }
-        if(arr1List2.size()>0){
-            if(!arr1List2.get(0).toString().equals("[]"))
+/*        if(arr1List2.size()>0){
+            if(!arr1List2.get(0).toString().equals("[]"))*/
             dgEnclosureInfo.setAccountingFirmList((List<String>) arr1List2.get(0));
-            if(!arr1List2.get(1).toString().equals("[]"))
             dgEnclosureInfo.setAssessmentReportList((List<String>) arr1List2.get(1));
-            if(!arr1List2.get(2).toString().equals("[]"))
             dgEnclosureInfo.setBusinessLicenseList((List<String>) arr1List2.get(2));
-            if(!arr1List2.get(3).toString().equals("[]"))
             dgEnclosureInfo.setCertificateAuthorizationList((List<String>) arr1List2.get(3));
-            if(!arr1List2.get(4).toString().equals("[]"))
             dgEnclosureInfo.setCompanyConstitutionList((List<String>) arr1List2.get(4));
-            if(!arr1List2.get(5).toString().equals("[]"))
             dgEnclosureInfo.setCompanyCreditList((List<String>) arr1List2.get(5));
-            if(!arr1List2.get(6).toString().equals("[]"))
             dgEnclosureInfo.setConversationSummaryList((List<String>) arr1List2.get(6));
-            if(!arr1List2.get(7).toString().equals("[]"))
             dgEnclosureInfo.setCreditReportList((List<String>) arr1List2.get(7));
-            if(!arr1List2.get(8).toString().equals("[]"))
             dgEnclosureInfo.setInspectionPhotosList((List<String>) arr1List2.get(8));
-            if(!arr1List2.get(9).toString().equals("[]"))
             dgEnclosureInfo.setLegalCardCopyList((List<String>) arr1List2.get(9));
-            if(!arr1List2.get(10).toString().equals("[]"))
             dgEnclosureInfo.setLegalCopyList((List<String>) arr1List2.get(10));
-            if(!arr1List2.get(11).toString().equals("[]"))
             dgEnclosureInfo.setTaxCertificateList((List<String>) arr1List2.get(11));
-            if(!arr1List2.get(12).toString().equals("[]"))
             dgEnclosureInfo.setMeetingMinutesList((List<String>) arr1List2.get(12));
-            if(!arr1List2.get(13).toString().equals("[]"))
             dgEnclosureInfo.setMarriageCopyList((List<String>) arr1List2.get(13));
-        }
+//        }
 
         BusinessApplicationDetailResponse businessApplicationDetail= new BusinessApplicationDetailResponse();
         businessApplicationDetail.setDgApplyAmountInfo(dgApplyAmountInfo);
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 83733c3d..e53ec9f9 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
@@ -164,36 +164,23 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
                 arr1List2.add(i, null);
             }
         }
-        if(arr1List2.size()>0){
-            if(!arr1List2.get(0).toString().equals("[]"))
+/*        if(arr1List2.size()>0){
+            if(!arr1List2.get(0).toString().equals("[]"))*/
                 dgEnclosureInfo.setAccountingFirmList((List<String>) arr1List2.get(0));
-            if(!arr1List2.get(1).toString().equals("[]"))
                 dgEnclosureInfo.setAssessmentReportList((List<String>) arr1List2.get(1));
-            if(!arr1List2.get(2).toString().equals("[]"))
                 dgEnclosureInfo.setBusinessLicenseList((List<String>) arr1List2.get(2));
-            if(!arr1List2.get(3).toString().equals("[]"))
                 dgEnclosureInfo.setCertificateAuthorizationList((List<String>) arr1List2.get(3));
-            if(!arr1List2.get(4).toString().equals("[]"))
                 dgEnclosureInfo.setCompanyConstitutionList((List<String>) arr1List2.get(4));
-            if(!arr1List2.get(5).toString().equals("[]"))
                 dgEnclosureInfo.setCompanyCreditList((List<String>) arr1List2.get(5));
-            if(!arr1List2.get(6).toString().equals("[]"))
                 dgEnclosureInfo.setConversationSummaryList((List<String>) arr1List2.get(6));
-            if(!arr1List2.get(7).toString().equals("[]"))
                 dgEnclosureInfo.setCreditReportList((List<String>) arr1List2.get(7));
-            if(!arr1List2.get(8).toString().equals("[]"))
                 dgEnclosureInfo.setInspectionPhotosList((List<String>) arr1List2.get(8));
-            if(!arr1List2.get(9).toString().equals("[]"))
                 dgEnclosureInfo.setLegalCardCopyList((List<String>) arr1List2.get(9));
-            if(!arr1List2.get(10).toString().equals("[]"))
                 dgEnclosureInfo.setLegalCopyList((List<String>) arr1List2.get(10));
-            if(!arr1List2.get(11).toString().equals("[]"))
                 dgEnclosureInfo.setTaxCertificateList((List<String>) arr1List2.get(11));
-            if(!arr1List2.get(12).toString().equals("[]"))
                 dgEnclosureInfo.setMeetingMinutesList((List<String>) arr1List2.get(12));
-            if(!arr1List2.get(13).toString().equals("[]"))
                 dgEnclosureInfo.setMarriageCopyList((List<String>) arr1List2.get(13));
-        }
+//        }
 
 
         //查询担保部经理审核的金额和期限
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 5418176b..c28e4987 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
@@ -238,36 +238,23 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
                 arr1List2.add(i,null);
             }
         }
-        if(arr1List2.size()>0){
-            if(!arr1List2.get(0).toString().equals("[]"))
+/*        if(arr1List2.size()>0){
+            if(!arr1List2.get(0).toString().equals("[]"))*/
                 dgEnclosureInfo.setAccountingFirmList((List<String>) arr1List2.get(0));
-            if(!arr1List2.get(1).toString().equals("[]"))
                 dgEnclosureInfo.setAssessmentReportList((List<String>) arr1List2.get(1));
-            if(!arr1List2.get(2).toString().equals("[]"))
                 dgEnclosureInfo.setBusinessLicenseList((List<String>) arr1List2.get(2));
-            if(!arr1List2.get(3).toString().equals("[]"))
                 dgEnclosureInfo.setCertificateAuthorizationList((List<String>) arr1List2.get(3));
-            if(!arr1List2.get(4).toString().equals("[]"))
                 dgEnclosureInfo.setCompanyConstitutionList((List<String>) arr1List2.get(4));
-            if(!arr1List2.get(5).toString().equals("[]"))
                 dgEnclosureInfo.setCompanyCreditList((List<String>) arr1List2.get(5));
-            if(!arr1List2.get(6).toString().equals("[]"))
                 dgEnclosureInfo.setConversationSummaryList((List<String>) arr1List2.get(6));
-            if(!arr1List2.get(7).toString().equals("[]"))
                 dgEnclosureInfo.setCreditReportList((List<String>) arr1List2.get(7));
-            if(!arr1List2.get(8).toString().equals("[]"))
                 dgEnclosureInfo.setInspectionPhotosList((List<String>) arr1List2.get(8));
-            if(!arr1List2.get(9).toString().equals("[]"))
                 dgEnclosureInfo.setLegalCardCopyList((List<String>) arr1List2.get(9));
-            if(!arr1List2.get(10).toString().equals("[]"))
                 dgEnclosureInfo.setLegalCopyList((List<String>) arr1List2.get(10));
-            if(!arr1List2.get(11).toString().equals("[]"))
                 dgEnclosureInfo.setTaxCertificateList((List<String>) arr1List2.get(11));
-            if(!arr1List2.get(12).toString().equals("[]"))
                 dgEnclosureInfo.setMeetingMinutesList((List<String>) arr1List2.get(12));
-            if(!arr1List2.get(13).toString().equals("[]"))
                 dgEnclosureInfo.setMarriageCopyList((List<String>) arr1List2.get(13));
-        }
+//        }
 
         //查询该业务id下对应的C角
         DgMessageInvestigation messageInvestigate = this.baseMapper.selectOne(new QueryWrapper<DgMessageInvestigation>()
diff --git a/dq-financial-hrms-auth/src/main/resources/mapper/hrauth/RolePermissionMapper.xml b/dq-financial-hrms-auth/src/main/resources/mapper/hrauth/RolePermissionMapper.xml
index 7dfeafea..406a66f5 100644
--- a/dq-financial-hrms-auth/src/main/resources/mapper/hrauth/RolePermissionMapper.xml
+++ b/dq-financial-hrms-auth/src/main/resources/mapper/hrauth/RolePermissionMapper.xml
@@ -80,7 +80,7 @@
     </delete>
 
     <select id="uniqueRoleName" parameterType="string" resultType="java.lang.Integer">
-        select count(0) from hrms_role where `name` = #{name}
+        select count(0) from hrms_role where `name` = #{name} and del_or_not=0
     </select>
 
     <select id="selectRoleByUserId" parameterType="long" resultType="com.daqing.framework.domain.hrms.EmployeeRoleEntity">