From b431c00a3e736e27599cd34793c65369fdb7b8cd Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 04 Jan 2024 15:50:50 +0800
Subject: [PATCH] 模拟成绩查询修改
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 86 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 86 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 6a2857d..5c4ba7b 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -104,6 +104,8 @@
private final SecurityPaperService securityPaperService;
private final IUserDetailService userDetailService;
+ private final IUserWxService userWxService;
+
@Override
@Transactional(rollbackFor = Exception.class)
public boolean submit(User user) {
@@ -322,6 +324,89 @@
User user = baseMapper.getUser(tenantId, account, password);
return buildUserInfo(user, userEnum);
}
+
+
+ @Override
+ public UserInfo wxUserInfo(String tenantId, String account, String password, UserEnum userEnum) {
+ //先去blade_user_wx表里查
+ UserWx userWx = userWxService.getUserWx(tenantId, account, password);
+
+ if (userWx != null){
+ //根据身份证号去user表里查
+ User userParam = new User();
+ userParam.setCardid(userWx.getCardid());
+ userParam.setIsDeleted(0);
+
+ List<User> list = list(Condition.getQueryWrapper(userParam));
+ //user表里有数据，就直接返回user表的数据
+ if (list.size()>0){
+ User user = list.get(0);
+ return buildUserInfo(user, userEnum);
+ }else{
+ //
+ User user = BuildUser(userWx);
+ return buildUserInfo(user, userEnum);
+ }
+ }else{
+ return null;
+ }
+ }
+
+ private User BuildUser(UserWx userWx) {
+ User user = new User();
+
+ user.setId(userWx.getId());
+ user.setCode(userWx.getCode());
+ user.setUserType(userWx.getUserType());
+ user.setAccount(userWx.getAccount());
+ user.setPassword(userWx.getPassword());
+ user.setName(userWx.getName());
+ user.setRealName(userWx.getRealName());
+ user.setAvatar(userWx.getAvatar());
+ user.setEmail(userWx.getEmail());
+ user.setPhone(userWx.getPhone());
+ user.setBirthday(userWx.getBirthday());
+ user.setSex(userWx.getSex());
+ user.setRoleId(userWx.getRoleId());
+ user.setDeptId(userWx.getDeptId());
+ user.setPostId(userWx.getPostId());
+ user.setCardid(userWx.getCardid());
+ user.setNativeplace(userWx.getNativeplace());
+ user.setNation(userWx.getNation());
+ user.setEducation(userWx.getEducation());
+ user.setPoliticaloutlook(userWx.getPoliticaloutlook());
+ user.setHeight(userWx.getHeight());
+ user.setCell(userWx.getCell());
+ user.setEmail(userWx.getEmail());
+ user.setHold(userWx.getHold());
+ user.setStatus(userWx.getStatus());
+ user.setJurisdiction(userWx.getJurisdiction());
+ user.setSecuritynumber(userWx.getSecuritynumber());
+ user.setExaminationType(userWx.getExaminationType());
+ user.setFingerprint(userWx.getFingerprint());
+ user.setPhoto(userWx.getPhoto());
+ user.setDispatch(userWx.getDispatch());
+ user.setMyPicture(userWx.getMyPicture());
+ user.setIsApply(userWx.getIsApply());
+ user.setBirthtime(userWx.getBirthtime());
+ user.setIsTrain(userWx.getIsTrain());
+ user.setHealstats(userWx.getHealstats());
+ user.setSoil(userWx.getSoil());
+ user.setPaperTime(userWx.getPaperTime());
+ user.setReasonForLeav(userWx.getReasonForLeav());
+ user.setImgForLeav(userWx.getImgForLeav());
+ user.setHoldv(userWx.getHoldv());
+ user.setHoldvtime(userWx.getHoldvtime());
+ user.setInsurance(userWx.getInsurance());
+ user.setAuditTime(userWx.getAuditTime());
+ user.setGuncode(userWx.getGuncode());
+ user.setEquipmentCode(userWx.getEquipmentCode());
+ user.setIsFreeze(userWx.getIsFreeze());
+ user.setAuditStatus(userWx.getAuditStatus());
+
+ return user;
+ }
+
private UserInfo buildUserInfo(User user) {
return buildUserInfo(user, UserEnum.WEB);
@@ -1999,4 +2084,5 @@
}
}
}
+
}
--
Gitblit v1.9.3