|
@@ -294,8 +294,7 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
|
|
|
if (sysUser == null) {
|
|
|
return R.failed("用户不存在");
|
|
|
}
|
|
|
- // 查询dept
|
|
|
- SysDept dept = sysDeptService.getById(sysUser.getDeptId());
|
|
|
+
|
|
|
// 查询userSub
|
|
|
SysUserSub userSub = sysUserSubService.getOne(Wrappers.<SysUserSub>lambdaQuery()
|
|
|
.eq(SysUserSub::getDeptId, sysUser.getDeptId())
|
|
@@ -311,11 +310,15 @@ public class SysUserSignCertServiceImpl implements SysUserSignCertService {
|
|
|
}
|
|
|
} else if (userSignCertDTO.getSubjectLocation().getGigType().equals(GigTypeEnum.OLADING)) {
|
|
|
if (OladingCertStatus.SIGNED.getCode().equals(String.valueOf(userSub.getCertStatus()))
|
|
|
+ || OladingCertStatus.SIGNING.getCode().equals(String.valueOf(userSub.getCertStatus()))
|
|
|
|| OladingCertStatus.CERT.getCode().equals(String.valueOf(userSub.getCertStatus()))) {
|
|
|
return R.ok(MapUtil.builder("certStatus", OladingCertStatus.resolve(String.valueOf(userSub.getCertStatus()))).build());
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ // 查询dept
|
|
|
+ SysDept dept = sysDeptService.getById(sysUser.getDeptId());
|
|
|
+
|
|
|
// 发起签约/增员
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
params.put("enterpriseCode", dept.getTaxCode());
|