|
@@ -93,6 +93,10 @@ public class OwnAuthController extends BaseController {
|
|
|
@Autowired
|
|
|
private ISysUserRoleService sysUserRoleService;
|
|
|
@Autowired
|
|
|
+ private ISysCompanySpareService sysCompanySpareService;
|
|
|
+ @Autowired
|
|
|
+ private ISysCompanyRelService sysCompanyRelService;
|
|
|
+ @Autowired
|
|
|
private IOwnNoticeService ownNoticeService;
|
|
|
@Autowired
|
|
|
private ISysConfigService configService;
|
|
@@ -232,7 +236,7 @@ public class OwnAuthController extends BaseController {
|
|
|
queryWrapper.eq(SysCompany::getScyName,scyName);
|
|
|
//统一社会信用代码
|
|
|
queryWrapper.eq(SysCompany::getScySocialCode,scySocialCode);
|
|
|
- queryWrapper.ne(SysCompany::getScyStatus,"99");
|
|
|
+ queryWrapper.ne(SysCompany::getScyStatus,"99").ne(SysCompany::getScyStatus,"02");
|
|
|
List<SysCompany> list = sysCompanyService.findSysCompanys(queryWrapper);
|
|
|
if (list.size()>0){
|
|
|
return R.fail("当前公司已存在,请重新选择公司");
|
|
@@ -757,6 +761,48 @@ public class OwnAuthController extends BaseController {
|
|
|
redisService.setCacheObject(CacheConstants.LOGIN_TOKEN_KEY + token, userInfo, Constants.TOKEN_EXPIRE * 60, TimeUnit.SECONDS);
|
|
|
//返回企业信息
|
|
|
SysCompany company = sysCompanyService.getById(scyId);
|
|
|
+ //查询链属公司信息
|
|
|
+ LambdaQueryWrapper<SysCompanySpare> companySpare = new LambdaQueryWrapper<>();
|
|
|
+ companySpare.eq(SysCompanySpare::getScpSocialCode,company.getScySocialCode());
|
|
|
+ companySpare.eq(SysCompanySpare::getScpStatus,"00");
|
|
|
+ List<SysCompanySpare> sysCompanySpare = sysCompanySpareService.findSysCompanySpares(companySpare);
|
|
|
+ //新增链属关系
|
|
|
+ for(int i = 0;i<sysCompanySpare.size();i++){
|
|
|
+ SysCompanyRel companyRel =new SysCompanyRel();
|
|
|
+ String scrId = IdUtils.fastSimpleUUID();
|
|
|
+ companyRel.setScrId(scrId);
|
|
|
+ companyRel.setScrLaunchCompanyId(sysCompanySpare.get(i).getScpCompanyId());
|
|
|
+ companyRel.setScrReceiveCompanyId(scyId);
|
|
|
+ //供应商
|
|
|
+ if("00".equals(sysCompanySpare.get(i).getScpType())){
|
|
|
+ //00:待链属, 01:正常, 02:拒绝链属, 99:删除
|
|
|
+ companyRel.setScrStatus("01");
|
|
|
+ companyRel.setScrLaunchType("00");
|
|
|
+ companyRel.setScrReceiveType("01");
|
|
|
+ }else{
|
|
|
+ //00:待链属, 01:正常, 02:拒绝链属, 99:删除
|
|
|
+ companyRel.setScrStatus("00");
|
|
|
+ companyRel.setScrLaunchType("01");
|
|
|
+ companyRel.setScrReceiveType("00");
|
|
|
+ }
|
|
|
+ String contact =null;
|
|
|
+ if("1".equals(CommonUtil.objToString(map.get("legalHandles")))){
|
|
|
+ contact = handler;
|
|
|
+ }else{
|
|
|
+ contact= scyLegal;
|
|
|
+ }
|
|
|
+ companyRel.setScrContarct(contact);
|
|
|
+ companyRel.setScrContarctPhone(phoneNumber);
|
|
|
+ companyRel.setCreateBy(sysCompanySpare.get(i).getCreateBy());
|
|
|
+ companyRel.setCreateTime(sysCompanySpare.get(i).getCreateTime());
|
|
|
+ sysCompanyRelService.createSysCompanyRel(companyRel);
|
|
|
+ SysCompanySpare companySpare1 =new SysCompanySpare();
|
|
|
+ companySpare1.setScpId(sysCompanySpare.get(i).getScpId());
|
|
|
+ companySpare1.setScpRelId(scrId);
|
|
|
+ sysCompanySpareService.updateSysCompanySpare(companySpare1);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
if(company.getScyAuthStatus()=="02"){
|
|
|
String tittle = "【企业认证】"+scyName+"CFCA工商四要素认证失败,请联系用户"+phoneNumber+"线下核实企业信息;";
|
|
|
ownNoticeService.sendNotice(scyId,scyId,tittle,"00",null,"09","0","1",null, null, null);
|
|
@@ -1062,6 +1108,7 @@ public class OwnAuthController extends BaseController {
|
|
|
//待实名认证
|
|
|
sysCompany.setScyStatus("04");
|
|
|
sysCompanyService.updateSysCompany(sysCompany);
|
|
|
+
|
|
|
// 刷新登录用户菜单和权限
|
|
|
SysUser sysUser = userInfo.getSysUser();
|
|
|
sysUser.setCompanyId(scyId);
|
|
@@ -1253,7 +1300,18 @@ public class OwnAuthController extends BaseController {
|
|
|
sysUserRoleService.insertSysUserRole(sysUserRole);
|
|
|
}
|
|
|
}
|
|
|
- //TODO 加消息通知
|
|
|
+ //查询链属公司信息
|
|
|
+ LambdaQueryWrapper<SysCompanySpare> companySpare = new LambdaQueryWrapper<>();
|
|
|
+ companySpare.eq(SysCompanySpare::getScpSocialCode,scySocialCode);
|
|
|
+ companySpare.eq(SysCompanySpare::getScpStatus,"00");
|
|
|
+ List<SysCompanySpare> sysCompanySpare = sysCompanySpareService.findSysCompanySpares(companySpare);
|
|
|
+ //新增链属关系
|
|
|
+ for(int i = 0;i<sysCompanySpare.size();i++){
|
|
|
+ SysCompanySpare companySpare1 =new SysCompanySpare();
|
|
|
+ companySpare1.setScpId(sysCompanySpare.get(i).getScpId());
|
|
|
+ companySpare1.setScpStatus("01");
|
|
|
+ sysCompanySpareService.updateSysCompanySpare(companySpare1);
|
|
|
+ }
|
|
|
//获取经办人id
|
|
|
LambdaQueryWrapper<SysUserCompanyRel> companyRelLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
companyRelLambdaQueryWrapper.eq(SysUserCompanyRel::getSucrCompanyId,scyId);
|