记得上下班打卡 | git大法好,push需谨慎

Commit fe4f86ea authored by GaoHu's avatar GaoHu

exit

parent 2f419602
......@@ -112,7 +112,9 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
lambdaQueryWrapper.eq(SmileOrganization::getId, smileOrganization.getId());
lambdaQueryWrapper.eq(SmileOrganization::getDelTag, 0);
SmileOrganization oleOrganization = smileOrganizationMapper.selectOne(lambdaQueryWrapper);
if (oleOrganization == null) {
return AjaxResult.warn("参数错误");
}
LambdaQueryWrapper<SmileOrganization> organizationQueryWrapper = new LambdaQueryWrapper<>();
organizationQueryWrapper.ne(SmileOrganization::getId, smileOrganization.getId());
organizationQueryWrapper.eq(SmileOrganization::getName, smileOrganization.getName());
......@@ -126,10 +128,10 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
userLambdaQueryWrapper.eq(SmileUser::getUid, smileOrganization.getAgentId());
userLambdaQueryWrapper.eq(SmileUser::getDelTag, 0);
userLambdaQueryWrapper.eq(SmileUser::getState, 0);
userLambdaQueryWrapper.in(SmileUser::getType,1,2);
userLambdaQueryWrapper.in(SmileUser::getType, 1, 2);
SmileUser user = smileUserMapper.selectOne(userLambdaQueryWrapper);
if (user != null && user.getType() == 1) {
if (user.getOrgId().equals(oleOrganization.getId())){
if (user.getOrgId().equals(oleOrganization.getId())) {
return AjaxResult.warn("该成员为该组总代!");
}
return AjaxResult.warn("该成员为其他组织总代!");
......@@ -170,7 +172,7 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
smileUserVO.setType(1);
smileUserVO.setOrgId(smileOrganization.getId());
smileUserVO.setAgentId(smileOrganization.getAgentId());
smileRedisUtils.setSmileUserVO(smileUserVO.getUid(),smileUserVO);
smileRedisUtils.setSmileUserVO(smileUserVO.getUid(), smileUserVO);
//修改组织信息
oleOrganization.setName(smileOrganization.getName());
oleOrganization.setAgentId(smileOrganization.getAgentId());
......@@ -198,7 +200,7 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
smileUserVO.setType(1);
smileUserVO.setOrgId(smileOrganization.getId());
smileUserVO.setAgentId(smileOrganization.getAgentId());
smileRedisUtils.setSmileUserVO(smileUserVO.getUid(),smileUserVO);
smileRedisUtils.setSmileUserVO(smileUserVO.getUid(), smileUserVO);
}
smileOrganizationMapper.updateById(oleOrganization);
return AjaxResult.success();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment