|
@@ -173,15 +173,25 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
|
|
String name = newBodyJson.getString("name");
|
|
String name = newBodyJson.getString("name");
|
|
String state = newBodyJson.getString("state");
|
|
String state = newBodyJson.getString("state");
|
|
String resMsg = newBodyJson.getString("resMsg");
|
|
String resMsg = newBodyJson.getString("resMsg");
|
|
-
|
|
|
|
|
|
+ String merId = newBodyJson.getString("merId");
|
|
|
|
+
|
|
|
|
+ // 查询所属企业
|
|
|
|
+ SysDeptSub sysDeptSub = sysDeptSubService.getOne(Wrappers.<SysDeptSub>lambdaQuery()
|
|
|
|
+ .eq(SysDeptSub::getSubjectLocation, SubjectLocation.QI_FU)
|
|
|
|
+ .eq(SysDeptSub::getAppId, merId));
|
|
|
|
+ if (sysDeptSub == null) {
|
|
|
|
+ log.error("用户所属企业不存在name={},idCard={},mobile={},merId={}", name, idCard, mobile, merId);
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
// 查询当前用户
|
|
// 查询当前用户
|
|
SysUser sysUser = sysUserService.getOne(Wrappers.<SysUser>lambdaQuery()
|
|
SysUser sysUser = sysUserService.getOne(Wrappers.<SysUser>lambdaQuery()
|
|
|
|
+ .eq(SysUser::getDeptId, sysDeptSub.getDeptId())
|
|
.eq(SysUser::getRealname, name)
|
|
.eq(SysUser::getRealname, name)
|
|
.eq(SysUser::getIdCardNumber, idCard)
|
|
.eq(SysUser::getIdCardNumber, idCard)
|
|
.eq(SysUser::getUsername, mobile)
|
|
.eq(SysUser::getUsername, mobile)
|
|
.eq(SysUser::getDelFlag, DelEnum.NOT_DEL.val()));
|
|
.eq(SysUser::getDelFlag, DelEnum.NOT_DEL.val()));
|
|
if (sysUser == null) {
|
|
if (sysUser == null) {
|
|
- log.warn("用户不存在name={},idCard={},mobile={}", name, idCard, mobile);
|
|
|
|
|
|
+ log.error("用户不存在name={},idCard={},mobile={}", name, idCard, mobile);
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -190,7 +200,7 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
|
|
.eq(SysUserSub::getUserId, sysUser.getUserId())
|
|
.eq(SysUserSub::getUserId, sysUser.getUserId())
|
|
.eq(SysUserSub::getSubjectLocation, SubjectLocation.QI_FU));
|
|
.eq(SysUserSub::getSubjectLocation, SubjectLocation.QI_FU));
|
|
if (userSub == null) {
|
|
if (userSub == null) {
|
|
- log.warn("没有查到对应userSub数据 userId={}", sysUser.getUserId());
|
|
|
|
|
|
+ log.error("没有查到对应userSub数据 userId={}", sysUser.getUserId());
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
|
|
|