From c1a463b9f1c0a7160dbd0ac1c7490eef13861a5e Mon Sep 17 00:00:00 2001
From: huangh <hshgjzd5@163.com>
Date: Tue, 29 Oct 2024 15:02:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUserService.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUserService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUserService.java
index 1055308..a626ba0 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUserService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUserService.java
@@ -215,6 +215,10 @@
return mapper.selectById(loginUserId);
}
+ public CtUser getByIdCard(String idCard) {
+ return mapper.selectByIdCard(idCard);
+ }
+
/**
* web端-获取人员信息列表查询条件
* @param userId 当前登录用户编号
@@ -354,7 +358,11 @@
ctUser.setJoinWay(UserBaseConsts.JOIN_WAY_1);
ctUser.setRealStatus(UserBaseConsts.REAL_STATUS_0);
ctUser.setStatus(UserBaseConsts.USER_STATUS_1);
- ctUser.setCustId(loginUser.getCustId());
+ if(loginUser!=null){
+ ctUser.setCustId(loginUser.getCustId());
+ }else {
+ ctUser.setCustId("-1");
+ }
mapper.insert(ctUser);
// 创建账号
--
Gitblit v1.8.0