企业认证校验

tianhu-system/src/main/java/com/tianhu/system/companyAuth/controller/OwnAuthController.java

@@ -236,7 +236,7 @@ public class OwnAuthController extends BaseController {
         queryWrapper.eq(SysCompany::getScyName,scyName);
         //统一社会信用代码
         queryWrapper.eq(SysCompany::getScySocialCode,scySocialCode);
-        queryWrapper.ne(SysCompany::getScyStatus,"99").or().ne(SysCompany::getScyStatus,"02");
+        queryWrapper.and(i -> i.ne(SysCompany::getScyStatus,"99").or().ne(SysCompany::getScyStatus,"02"));
         List<SysCompany> list = sysCompanyService.findSysCompanys(queryWrapper);
         if (list.size()>0){
             return R.fail("当前公司已存在,请重新选择公司");
@@ -572,6 +572,8 @@ public class OwnAuthController extends BaseController {
                 }
                 sysUserCompanyRel.setSucrCardFile(fsfzzList);
                 sysUserCompanyRel.setSucrCardBackFile(jsfzfList);
+                sysUserCompanyRel.setUpdateBy(use.getUserId()+"");
+                sysUserCompanyRel.setUpdateTime(new Date());
                 LambdaQueryWrapper<SysUserCompanyRel> lambdaQueryWrapper = new LambdaQueryWrapper<>();
                 lambdaQueryWrapper.eq(SysUserCompanyRel::getSucrUserId,use.getUserId());
                 lambdaQueryWrapper.eq(SysUserCompanyRel::getSucrCompanyId,scyId);
@@ -590,6 +592,8 @@ public class OwnAuthController extends BaseController {
                 }
                 sysUserCompanyRel.setSucrCardFile(fsfzzList);
                 sysUserCompanyRel.setSucrCardBackFile(jsfzfList);
+                sysUserCompanyRel.setCreateBy(use.getUserId()+"");
+                sysUserCompanyRel.setCreateTime(new Date());
                 sysUserCompanyRelService.createSysUserCompanyRel(sysUserCompanyRel);
             }
         // 经办人与登录用户不是同一手机号
@@ -627,7 +631,9 @@ public class OwnAuthController extends BaseController {
                     sysUserCompanyRel.setSucrCard(scyLegalId);
                 }
                 sysUserCompanyRel.setSucrCardFile(fsfzzList);
-                    sysUserCompanyRel.setSucrCardBackFile(jsfzfList);
+                sysUserCompanyRel.setSucrCardBackFile(jsfzfList);
+                sysUserCompanyRel.setCreateBy(use.getUserId()+"");
+                sysUserCompanyRel.setCreateTime(new Date());
                 sysUserCompanyRelService.saveOrUpdate(sysUserCompanyRel);
             // 经办人存在
             } else {
@@ -658,6 +664,8 @@ public class OwnAuthController extends BaseController {
                 }
                 sysUserCompanyRel.setSucrCardFile(fsfzzList);
                 sysUserCompanyRel.setSucrCardBackFile(jsfzfList);
+                sysUserCompanyRel.setCreateBy(use.getUserId()+"");
+                sysUserCompanyRel.setCreateTime(new Date());
                 sysUserCompanyRelService.createSysUserCompanyRel(sysUserCompanyRel);
 
             }
@@ -684,6 +692,8 @@ public class OwnAuthController extends BaseController {
                 }
                 sysUserCompanyRel.setSucrCardFile(fsfzzList);
                 sysUserCompanyRel.setSucrCardBackFile(jsfzfList);
+                sysUserCompanyRel.setUpdateBy(use.getUserId()+"");
+                sysUserCompanyRel.setUpdateTime(new Date());
                 LambdaQueryWrapper<SysUserCompanyRel> lambdaQueryWrapper = new LambdaQueryWrapper<>();
                 lambdaQueryWrapper.eq(SysUserCompanyRel::getSucrUserId,use.getUserId());
                 lambdaQueryWrapper.eq(SysUserCompanyRel::getSucrCompanyId,scyId);
@@ -705,6 +715,8 @@ public class OwnAuthController extends BaseController {
                 }
                 sysUserCompanyRel.setSucrCardFile(fsfzzList);
                 sysUserCompanyRel.setSucrCardBackFile(jsfzfList);
+                sysUserCompanyRel.setCreateBy(use.getUserId()+"");
+                sysUserCompanyRel.setCreateTime(new Date());
                 sysUserCompanyRelService.createSysUserCompanyRel(sysUserCompanyRel);
                 if(userRole.size()==0){
                     sysUserRoleService.selectSysUserRoleList(sysUserRole);
@@ -749,6 +761,8 @@ public class OwnAuthController extends BaseController {
                 sysUserCompanyRel.setSucrUserId(operatorUserId);
                 sysUserCompanyRel.setSucrDeptId(deptId);
                 sysUserCompanyRel.setSucrHandler("0");
+                sysUserCompanyRel.setCreateBy(use.getUserId()+"");
+                sysUserCompanyRel.setCreateTime(new Date());
                 sysUserCompanyRelService.createSysUserCompanyRel(sysUserCompanyRel);
             }
         }
@@ -764,7 +778,7 @@ public class OwnAuthController extends BaseController {
         //查询链属公司信息
         LambdaQueryWrapper<SysCompanySpare> companySpare = new LambdaQueryWrapper<>();
         companySpare.eq(SysCompanySpare::getScpSocialCode,company.getScySocialCode());
-        companySpare.eq(SysCompanySpare::getScpRelId,null).or().eq(SysCompanySpare::getScpRelId,"");
+        companySpare.and(f -> f.eq(SysCompanySpare::getScpRelId,null).or().eq(SysCompanySpare::getScpRelId,""));
         List<SysCompanySpare>  sysCompanySpare =  sysCompanySpareService.findSysCompanySpares(companySpare);
         //新增链属关系
         for(int i = 0;i<sysCompanySpare.size();i++){