diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesUserServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesUserServiceImpl.java index 856d161b..aa5cc978 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesUserServiceImpl.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesUserServiceImpl.java @@ -144,7 +144,7 @@ public class CeesUserServiceImpl extends ServiceImpl i } else { return Result.error("管理员账号还未申请通过!"); } - // 2学生 + //2学生 case "2": LambdaQueryWrapper studentLambdaQueryWrapper = new LambdaQueryWrapper<>(); studentLambdaQueryWrapper.eq(Student::getUserId, user.getUserId()); @@ -157,6 +157,21 @@ public class CeesUserServiceImpl extends ServiceImpl i jsonObject.put("status", "1"); //1是填写信息 return Result.ok(jsonObject); } else { + if(StringUtils.isEmpty(student.getOpenId())){ + student.setOpenId(ceesUser.getOpenId()); + student.setUnionId(ceesUser.getUnionId()); + studentMapper.updateById(student); + user.setOpenId(ceesUser.getOpenId()); + user.setUnionId(ceesUser.getUnionId()); + ceesUserMapper.updateById(user); + return Result.error("正在进行数据关联!请5秒后刷新页面或退出重进!!"); + } + if(student.getOpenId().equals(ceesUser.getOpenId()) && StringUtils.isEmpty(student.getUnionId())){ + student.setUnionId(ceesUser.getUnionId()); + studentMapper.updateById(student); + user.setUnionId(ceesUser.getUnionId()); + ceesUserMapper.updateById(user); + } if(student.getOpenId().equals(ceesUser.getOpenId())){ JSONObject jsonObject = new JSONObject(); jsonObject.put("userId", user.getUserId()); @@ -180,6 +195,21 @@ public class CeesUserServiceImpl extends ServiceImpl i jsonObject.put("status", "1"); //1是填写信息 return Result.ok(jsonObject); } else { + if(StringUtils.isEmpty(ceesLocalTeacher.getOpenId())){ + ceesLocalTeacher.setOpenId(ceesUser.getOpenId()); + ceesLocalTeacher.setUnionId(ceesUser.getUnionId()); + ceesLocalTeacherMapper.updateById(ceesLocalTeacher); + user.setOpenId(ceesUser.getOpenId()); + user.setUnionId(ceesUser.getUnionId()); + ceesUserMapper.updateById(user); + return Result.error("正在进行数据关联!请5秒后刷新页面或退出重进!!"); + } + if(ceesLocalTeacher.getOpenId().equals(ceesUser.getOpenId()) && StringUtils.isEmpty(ceesLocalTeacher.getUnionId())){ + ceesLocalTeacher.setUnionId(ceesUser.getUnionId()); + ceesLocalTeacherMapper.updateById(ceesLocalTeacher); + user.setUnionId(ceesUser.getUnionId()); + ceesUserMapper.updateById(user); + } if(ceesLocalTeacher.getOpenId().equals(ceesUser.getOpenId())){ JSONObject jsonObject = new JSONObject(); jsonObject.put("userId", user.getUserId());