Merge branch 'bocom' of http://192.168.0.200:3000/liuj/factoring-trade-backend into bocom

# Conflicts:
#	src/main/java/com/sunxung/factoring/service/bocom/vipaccount/impl/BocomVipAccountBasicInfoServiceImpl.java

src/main/java/com/sunxung/factoring/mapper/bocom/register/BocomBasicInfoMapper.java

@@ -55,4 +55,11 @@ public interface BocomBasicInfoMapper extends BaseMapper<BocomBasicInfo> {
      * @param bocomBasicInfo
      */
     void save(BocomBasicInfo bocomBasicInfo);
+
+    /**
+     * 查询所有
+     * @return
+     */
+    List<BocomBasicInfo> findAll();
+
 }

src/main/java/com/sunxung/factoring/service/bocom/register/impl/BocomBasicInfoServiceImpl.java

@@ -1692,38 +1692,11 @@ public class BocomBasicInfoServiceImpl extends ServiceImpl<BocomBasicInfoMapper,
                     }
 
                 } else if (oldBocomBasicInfo.getCustomerType() == 1) {
-                    Boolean changeActualController = false;
-                    //负责人
-                    BocomShareholderActualController oldActualController = bocomShareholderActualControllerService.lambdaQuery()
-                            .eq(BocomShareholderActualController::getBocomBasicInfoId, oldBocomBasicInfo.getId())
-                            .eq(BocomShareholderActualController::getPersonType, 2)
-                            .one();
-                    if (CollectionUtil.isNotEmpty(bocomBasicInfo.getBocomShareholderActualControllers())) {
-                        List<BocomShareholderActualController> actualControllerList = bocomBasicInfo
-                                .getBocomShareholderActualControllers().stream().filter(t -> t.getPersonType() == 2)
-                                .collect(Collectors.toList());
-                        if (CollectionUtil.isNotEmpty(actualControllerList)) {
-                            BocomShareholderActualController actualController = actualControllerList.get(0);
-                            if (!oldActualController.getCertificateCode().equals(actualController.getCertificateCode())) {
-                                changeActualController = true;
-                                //负责人变更
-                                legalFlag = "1";
-                                FileStorageDO fileStorageDO = fileService.lambdaQuery().eq(FileStorageDO::getBusinessType, FileModuleDict.ChildEnum.BOCOM_REGISTER_BUSINESS_LICENSE.getCode())
-                                        .eq(FileStorageDO::getBusinessId, bocomBasicInfo.getId())
-                                        .orderByDesc(FileStorageDO::getGmtCreate).one();
-                                if (fileStorageDO != null && fileStorageDO.getId().equals(bocomBasicInfo.getFileId())) {
-                                    throw new BusinessException(CodeUtil.FAIL, "公司法人变更必须重新上传营业执照！");
-                                }
-                                companyFlag = "1";
-
-                            }
-                        }
 
-                    }
-                    //如果单位名称、负责人证件号码、授权代理人证件号码与原来一致 抛异常
+                    //如果单位名称、授权代理人证件号码与原来一致 抛异常
                     if (oldBocomBasicInfo.getCustomerName().equals(bocomBasicInfo.getCustomerName()) &&
-                            !changeActualController && oldAgent.getCertificateCode().equals(newAgent.getCertificateCode())) {
-                        throw new BusinessException(CodeUtil.FAIL, "单位名称、负责人证件号码、授权代理人证件号码“未发生变更，其他信息请走修改流程！");
+                           oldAgent.getCertificateCode().equals(newAgent.getCertificateCode())) {
+                        throw new BusinessException(CodeUtil.FAIL, "单位名称、授权代理人证件号码“未发生变更，其他信息请走修改流程！");
                     }
 
                 }
@@ -1735,33 +1708,14 @@ public class BocomBasicInfoServiceImpl extends ServiceImpl<BocomBasicInfoMapper,
                         .one();
                 BocomLegalPersonInfo newLegalPersonInfo = bocomBasicInfo.getBocomLegalPersonInfo();
 
-                Boolean changeActualController = false;
-                //负责人
-                BocomShareholderActualController oldActualController = bocomShareholderActualControllerService.lambdaQuery()
-                        .eq(BocomShareholderActualController::getBocomBasicInfoId, oldBocomBasicInfo.getId())
-                        .eq(BocomShareholderActualController::getPersonType, 2)
-                        .one();
-                if (CollectionUtil.isNotEmpty(bocomBasicInfo.getBocomShareholderActualControllers())) {
-                    List<BocomShareholderActualController> actualControllerList = bocomBasicInfo
-                            .getBocomShareholderActualControllers().stream().filter(t -> t.getPersonType() == 2)
-                            .collect(Collectors.toList());
-                    if (CollectionUtil.isNotEmpty(actualControllerList)) {
-                        BocomShareholderActualController actualController = actualControllerList.get(0);
-                        if (!oldActualController.getCertificateCode().equals(actualController.getCertificateCode())) {
-                            changeActualController = true;
-                        }
-                    }
-                }
-
                 if (!oldBocomBasicInfo.getCustomerName().equals(bocomBasicInfo.getCustomerName()) ||
-                        !oldLegalPerson.getCertificateCode().equals(newLegalPersonInfo.getCertificateCode()) ||
-                        changeActualController) {
-                    throw new BusinessException(CodeUtil.FAIL, "当前账户，单位名称和法人/责任人不可变更！");
+                        !oldLegalPerson.getCertificateCode().equals(newLegalPersonInfo.getCertificateCode())
+                        ) {
+                    throw new BusinessException(CodeUtil.FAIL, "当前账户，单位名称和法人不可变更！");
                 }
 
             }
-
-
+            
         }
 
         modfCntlWord = "000" + companyFlag + "0000" + legalFlag + agentFlag;
@@ -2015,7 +1969,7 @@ public class BocomBasicInfoServiceImpl extends ServiceImpl<BocomBasicInfoMapper,
 
     @Override
     public void batchReSearch() {
-        List<BocomBasicInfo> list = list();
+        List<BocomBasicInfo> list = this.baseMapper.findAll();
         if (CollectionUtil.isNotEmpty(list)) {
             list.forEach(basic -> {
                 research(basic.getId());

src/main/java/com/sunxung/factoring/service/bocom/vipaccount/impl/BocomVipAccountBasicInfoServiceImpl.java

@@ -152,8 +152,6 @@ public class BocomVipAccountBasicInfoServiceImpl extends ServiceImpl<BocomVipAcc
             }
 
             autoAuthenticator(bocomVipAccountBasicInfo);
-
-
         }
 
         return bocomVipAccountBasicInfo;

src/main/resources/mapper/bocom/register/BocomBasicInfoMapper.xml

@@ -50,4 +50,7 @@
     <select id="findUserData" resultType="com.sunxung.factoring.entity.bocom.register.BocomBasicInfo">
         select * from bocom_basic_info where user_create = #{value}
     </select>
+    <select id="findAll" resultType="com.sunxung.factoring.entity.bocom.register.BocomBasicInfo">
+        select * from bocom_basic_info
+    </select>
 </mapper>