exit

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileOrganizationServiceImpl.java

@@ -111,7 +111,7 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
         lambdaQueryWrapper.eq(SmileOrganization::getDelTag, 0);
         SmileOrganization oleOrganization = smileOrganizationMapper.selectOne(lambdaQueryWrapper);
         //修改总代与原总代不同
-        if (!StringUtils.isEmpty(smileOrganization.getAgentId()) && !oleOrganization.getAgentId().equals(smileOrganization.getAgentId())) {
+        if (!StringUtils.isEmpty(smileOrganization.getAgentId()) && !StringUtils.isEmpty(oleOrganization.getAgentId()) && oleOrganization.getAgentId().equals(smileOrganization.getAgentId())) {
             //判断该uid是否为总代
             LambdaQueryWrapper<SmileOrganization> organizationQueryWrapper = new LambdaQueryWrapper<>();
             organizationQueryWrapper.eq(SmileOrganization::getAgentId, smileOrganization.getAgentId());
@@ -130,7 +130,7 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
             oldSmileUsers.forEach(smileUser -> {
                 //修改缓存用户redis总代信息
                 SmileUserVO smileUserVO = smileRedisUtils.getSmileUserVO(smileUser.getUid());
-                smileUserVO.setType(smileUserVO.getUid().equals(smileOrganization.getAgentId()) ? 1 : 2);
+                smileUserVO.setType(smileUser.getUid().equals(smileOrganization.getAgentId()) ? 1 : 2);
                 smileUserVO.setAgentId(smileOrganization.getAgentId());
                 //修改redis缓存
                 smileRedisUtils.setSmileUserVO(smileUser.getUid(), smileUserVO);
@@ -145,8 +145,20 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
             smileOrganizationMapper.updateById(oleOrganization);
             return AjaxResult.success();
         }
-        //只改名
+        //只改名  或者原组织没有总代id
         oleOrganization.setName(smileOrganization.getName());
+        if (!StringUtils.isEmpty(smileOrganization.getAgentId())){
+            //修改总代
+            oleOrganization.setAgentId(smileOrganization.getAgentId());
+            //查询uid
+            LambdaQueryWrapper<SmileUser> userLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            userLambdaQueryWrapper.eq(SmileUser::getUid,smileOrganization.getAgentId());
+            userLambdaQueryWrapper.eq(SmileUser::getDelTag,0);
+            SmileUser smileUser = smileUserMapper.selectOne(userLambdaQueryWrapper);
+            smileUser.setType(1);
+            smileUser.setOrgId(smileOrganization.getId());
+            smileUserMapper.updateById(smileUser);
+        }
         smileOrganizationMapper.updateById(oleOrganization);
         return AjaxResult.success();
     }