|
@@ -140,6 +140,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
|
|
adminCompSelect.setAvatar(adminUser.getAvatar());
|
|
adminCompSelect.setAvatar(adminUser.getAvatar());
|
|
adminCompSelect.setCardPic(adminUser.getCardPic());
|
|
adminCompSelect.setCardPic(adminUser.getCardPic());
|
|
adminCompSelect.setDoctorAndSpecialist("1");
|
|
adminCompSelect.setDoctorAndSpecialist("1");
|
|
|
|
+ adminCompSelect.setYzh(user.getYzh());
|
|
|
|
|
|
|
|
|
|
QueryWrapper<AdminCompSelect> adminCompSelectQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<AdminCompSelect> adminCompSelectQueryWrapper = new QueryWrapper<>();
|
|
@@ -167,6 +168,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
|
|
adminCompSelect.setAvatar(adminUser.getAvatar());
|
|
adminCompSelect.setAvatar(adminUser.getAvatar());
|
|
adminCompSelect.setCardPic(adminUser.getCardPic());
|
|
adminCompSelect.setCardPic(adminUser.getCardPic());
|
|
adminCompSelect.setDoctorAndSpecialist("1");
|
|
adminCompSelect.setDoctorAndSpecialist("1");
|
|
|
|
+ adminCompSelect.setYzh(user.getYzh());
|
|
|
|
|
|
QueryWrapper<AdminCompSelect> adminCompSelectQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<AdminCompSelect> adminCompSelectQueryWrapper = new QueryWrapper<>();
|
|
adminCompSelectQueryWrapper.eq("phone", phone);
|
|
adminCompSelectQueryWrapper.eq("phone", phone);
|
|
@@ -445,7 +447,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public void updateByUser(AdminUser adminUser) {
|
|
|
|
|
|
+ public void updateByUser(AdminUser adminUser) {
|
|
String phone = adminUser.getPhone();
|
|
String phone = adminUser.getPhone();
|
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
QueryWrapper<AdminCompSelect> adminCompSelectQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<AdminCompSelect> adminCompSelectQueryWrapper = new QueryWrapper<>();
|
|
@@ -453,11 +455,15 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
|
|
adminCompSelectQueryWrapper.eq("sys_org_code",sysUser.getOrgCode());
|
|
adminCompSelectQueryWrapper.eq("sys_org_code",sysUser.getOrgCode());
|
|
adminCompSelectQueryWrapper.eq("doctor_and_specialist","1");
|
|
adminCompSelectQueryWrapper.eq("doctor_and_specialist","1");
|
|
AdminCompSelect adminCompSelect = adminCompSelectService.getOne(adminCompSelectQueryWrapper);
|
|
AdminCompSelect adminCompSelect = adminCompSelectService.getOne(adminCompSelectQueryWrapper);
|
|
- adminCompSelect.setKsName(adminUser.getKsname());
|
|
|
|
- adminCompSelect.setDwName(adminUser.getDwname());
|
|
|
|
- adminCompSelect.setAvatar(adminUser.getAvatar());
|
|
|
|
- adminCompSelect.setCardPic(adminUser.getCardPic());
|
|
|
|
- adminCompSelectService.updateById(adminCompSelect);
|
|
|
|
|
|
+ if (null!=adminCompSelect){
|
|
|
|
+ adminCompSelect.setKsName(adminUser.getKsname());
|
|
|
|
+ adminCompSelect.setDwName(adminUser.getDwname());
|
|
|
|
+ adminCompSelect.setAvatar(adminUser.getAvatar());
|
|
|
|
+ adminCompSelect.setCardPic(adminUser.getCardPic());
|
|
|
|
+ adminCompSelectService.updateById(adminCompSelect);
|
|
|
|
+ }
|
|
|
|
+ adminUserService.updateById(adminUser);
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -502,6 +508,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
|
|
adminCompSelect.setAvatar(adminUser.getAvatar());
|
|
adminCompSelect.setAvatar(adminUser.getAvatar());
|
|
adminCompSelect.setCardPic(adminUser.getCardPic());
|
|
adminCompSelect.setCardPic(adminUser.getCardPic());
|
|
adminCompSelect.setDoctorAndSpecialist("2");
|
|
adminCompSelect.setDoctorAndSpecialist("2");
|
|
|
|
+ adminCompSelect.setYzh(user.getYzh());
|
|
|
|
|
|
QueryWrapper<AdminCompSelect> adminCompSelectQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<AdminCompSelect> adminCompSelectQueryWrapper = new QueryWrapper<>();
|
|
adminCompSelectQueryWrapper.eq("phone", phone);
|
|
adminCompSelectQueryWrapper.eq("phone", phone);
|
|
@@ -528,6 +535,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
|
|
adminCompSelect.setAvatar(adminUser.getAvatar());
|
|
adminCompSelect.setAvatar(adminUser.getAvatar());
|
|
adminCompSelect.setCardPic(adminUser.getCardPic());
|
|
adminCompSelect.setCardPic(adminUser.getCardPic());
|
|
adminCompSelect.setDoctorAndSpecialist("2");
|
|
adminCompSelect.setDoctorAndSpecialist("2");
|
|
|
|
+ adminCompSelect.setYzh(user.getYzh());
|
|
|
|
|
|
QueryWrapper<AdminCompSelect> adminCompSelectQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<AdminCompSelect> adminCompSelectQueryWrapper = new QueryWrapper<>();
|
|
adminCompSelectQueryWrapper.eq("phone", phone);
|
|
adminCompSelectQueryWrapper.eq("phone", phone);
|
|
@@ -614,11 +622,15 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
|
|
adminCompSelectQueryWrapper.eq("sys_org_code",sysUser.getOrgCode());
|
|
adminCompSelectQueryWrapper.eq("sys_org_code",sysUser.getOrgCode());
|
|
adminCompSelectQueryWrapper.eq("doctor_and_specialist","2");
|
|
adminCompSelectQueryWrapper.eq("doctor_and_specialist","2");
|
|
AdminCompSelect adminCompSelect = adminCompSelectService.getOne(adminCompSelectQueryWrapper);
|
|
AdminCompSelect adminCompSelect = adminCompSelectService.getOne(adminCompSelectQueryWrapper);
|
|
- adminCompSelect.setKsName(adminUser.getKsname());
|
|
|
|
- adminCompSelect.setDwName(adminUser.getDwname());
|
|
|
|
- adminCompSelect.setAvatar(adminUser.getAvatar());
|
|
|
|
- adminCompSelect.setCardPic(adminUser.getCardPic());
|
|
|
|
- adminCompSelectService.updateById(adminCompSelect);
|
|
|
|
|
|
+ if (null!=adminCompSelect){
|
|
|
|
+ adminCompSelect.setKsName(adminUser.getKsname());
|
|
|
|
+ adminCompSelect.setDwName(adminUser.getDwname());
|
|
|
|
+ adminCompSelect.setAvatar(adminUser.getAvatar());
|
|
|
|
+ adminCompSelect.setCardPic(adminUser.getCardPic());
|
|
|
|
+ adminCompSelectService.updateById(adminCompSelect);
|
|
|
|
+ }
|
|
|
|
+ adminUserService.updateById(adminUser);
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|