admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

个人中心bug修复

Browse Source
This commit is contained in:
guoshengxiong 2024-05-22 17:57:31 +08:00
parent 0661fd6bdc
commit 96e402cc94
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml
View File

@ -35,7 +35,9 @@
SELECT t.worker_id as id, SELECT t.worker_id as id,
if(t.account_type=6,d.worker_name,t.real_name) as real_name, if(t.account_type=6,d.worker_name,t.real_name) as real_name,
if(t.account_type=6,d.sex,t.sex) as sex, if(t.account_type=6,d.sex,t.sex) as sex,
if(t.account_type=6,d.person_mail,t.person_mail) as person_mail, if(t.account_type=6,d.phone_number,t.user_tel) as user_tel,
CASE WHEN t.account_type=6 THEN d.person_mail WHEN t.account_type=10 or t.account_type=11 THEN xr.email ELSE
t.person_mail END as person_mail,
t.*, t.*,
c.role_name, c.role_name,
d.worker_name, d.worker_name,
@ -51,6 +53,7 @@
LEFT JOIN enterprise_info ei on ei.id=d.enterprise_id LEFT JOIN enterprise_info ei on ei.id=d.enterprise_id
LEFT JOIN project_enterprise pe on pe.enterprise_id=ei.id and pe.project_sn=t.sn LEFT JOIN project_enterprise pe on pe.enterprise_id=ei.id and pe.project_sn=t.sn
left join xz_project_org xpo on xpo.id=t.xz_project_org_id left join xz_project_org xpo on xpo.id=t.xz_project_org_id
left join xz_registry xr on xr.account = t.account and xr.approval_process = 2
<if test="param.qualityRegionId != null and param.qualityRegionId != ''"> <if test="param.qualityRegionId != null and param.qualityRegionId != ''">
JOIN quality_region_to_user qrtu on ei.id = qrtu.enterprise_id and t.user_id=qrtu.user_id and JOIN quality_region_to_user qrtu on ei.id = qrtu.enterprise_id and t.user_id=qrtu.user_id and
qrtu.quality_region_id = #{param.qualityRegionId} qrtu.quality_region_id = #{param.qualityRegionId}

20
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
View File

@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -298,6 +299,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
result.put("expire", false); result.put("expire", false);
result.put("systemLogoConfig", new SystemLogoConfig()); result.put("systemLogoConfig", new SystemLogoConfig());
result.put("personMail", systemUser.getPersonMail()); result.put("personMail", systemUser.getPersonMail());
result.put("avatar", systemUser.getAvatar());
if (Objects.equals(systemUser.getAccountType(), 10)) { if (Objects.equals(systemUser.getAccountType(), 10)) {
XzSystemUserToCompanyProject xzSystemUserToCompanyProject = xzSystemUserToCompanyProjectMapper.selectOne(new LambdaQueryWrapper<XzSystemUserToCompanyProject>() XzSystemUserToCompanyProject xzSystemUserToCompanyProject = xzSystemUserToCompanyProjectMapper.selectOne(new LambdaQueryWrapper<XzSystemUserToCompanyProject>()
.eq(XzSystemUserToCompanyProject::getType, 2) .eq(XzSystemUserToCompanyProject::getType, 2)
@ -419,6 +421,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
result.put("expire", false); result.put("expire", false);
result.put("systemLogoConfig", slc); result.put("systemLogoConfig", slc);
result.put("personMail", systemUser.getPersonMail()); result.put("personMail", systemUser.getPersonMail());
result.put("avatar", systemUser.getAvatar());
if (Objects.equals(systemUser.getAccountType(), 10)) { if (Objects.equals(systemUser.getAccountType(), 10)) {
XzSystemUserToCompanyProject xzSystemUserToCompanyProject = xzSystemUserToCompanyProjectMapper.selectOne(new LambdaQueryWrapper<XzSystemUserToCompanyProject>() XzSystemUserToCompanyProject xzSystemUserToCompanyProject = xzSystemUserToCompanyProjectMapper.selectOne(new LambdaQueryWrapper<XzSystemUserToCompanyProject>()
.eq(XzSystemUserToCompanyProject::getType, 2) .eq(XzSystemUserToCompanyProject::getType, 2)
@ -790,6 +793,23 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
systemUser.setPassword(passwordEncoder.encode(showPassword)); systemUser.setPassword(passwordEncoder.encode(showPassword));
} }
systemUserMapper.updateById(systemUser); systemUserMapper.updateById(systemUser);
if (systemUser.getAccountType() == 6) {
WorkerInfo wi = new WorkerInfo();
wi.setId(systemUser.getWorkerId());
wi.setSex(systemUser.getSex());
wi.setPersonMail(systemUser.getPersonMail());
wi.setWorkerName(systemUser.getRealName());
wi.setPhoneNumber(systemUser.getUserTel());
workerInfoMapper.updateById(wi);
} else if (systemUser.getAccountType() == 10 || systemUser.getAccountType() == 11) {
xzRegistryMapper.update(null, new LambdaUpdateWrapper<XzRegistry>()
.set(XzRegistry::getEmail, systemUser.getPersonMail())
.eq(XzRegistry::getAccount, systemUser.getAccount())
.eq(XzRegistry::getApprovalProcess, 2)
);
}
} }