exit

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

@@ -90,6 +90,7 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
         log.info("smileOrganizationVo:{}", smileOrganizationVo);
         LambdaQueryWrapper<SmileOrganization> queryWrapper = Wrappers.lambdaQuery(SmileOrganization.class);
         queryWrapper.eq(SmileOrganization::getName, smileOrganizationVo.getName());
+        queryWrapper.eq(SmileOrganization::getDelTag, 0);
         if (smileOrganizationMapper.selectOne(queryWrapper) == null) {
             SmileOrganization smileOrganization = new SmileOrganization();
             BeanUtils.copyProperties(smileOrganizationVo, smileOrganization);
@@ -110,27 +111,32 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
         lambdaQueryWrapper.eq(SmileOrganization::getId, smileOrganization.getId());
         lambdaQueryWrapper.eq(SmileOrganization::getDelTag, 0);
         SmileOrganization oleOrganization = smileOrganizationMapper.selectOne(lambdaQueryWrapper);
+        LambdaQueryWrapper<SmileOrganization> organizationQueryWrapper = new LambdaQueryWrapper<>();
+        organizationQueryWrapper.ne(SmileOrganization::getId, smileOrganization.getId());
+        organizationQueryWrapper.eq(SmileOrganization::getName, smileOrganization.getName());
+        organizationQueryWrapper.eq(SmileOrganization::getDelTag, 0);
+        List<SmileOrganization> smileOrganizations = smileOrganizationMapper.selectList(organizationQueryWrapper);
+        if (smileOrganizations != null && smileOrganizations.size() > 0) {
+            return AjaxResult.warn("组织名重复！");
+        }
+        //判断该uid是否为总代
+        LambdaQueryWrapper<SmileUser> userLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        userLambdaQueryWrapper.eq(SmileUser::getUid, smileOrganization.getAgentId());
+        userLambdaQueryWrapper.eq(SmileUser::getDelTag, 0);
+        userLambdaQueryWrapper.eq(SmileUser::getState, 0);
+        SmileUser user = smileUserMapper.selectOne(userLambdaQueryWrapper);
+        if (user != null && user.getType() == 1) {
+            return AjaxResult.warn("该成员为其他组织总代！");
+        } else if (user == null) {
+            return AjaxResult.warn("用户不存在！");
+        }
         //修改总代与原总代不同
-        if (!StringUtils.isEmpty(smileOrganization.getAgentId()) && !StringUtils.isEmpty(oleOrganization.getAgentId()) && oleOrganization.getAgentId().equals(smileOrganization.getAgentId())) {
-
-            LambdaQueryWrapper<SmileOrganization> organizationQueryWrapper = new LambdaQueryWrapper<>();
-            organizationQueryWrapper.ne(SmileOrganization::getId,smileOrganization.getId());
-            organizationQueryWrapper.eq(SmileOrganization::getName, smileOrganization.getName());
-            organizationQueryWrapper.eq(SmileOrganization::getDelTag, 0);
-            List<SmileOrganization> smileOrganizations = smileOrganizationMapper.selectList(organizationQueryWrapper);
-            if (smileOrganizations != null && smileOrganizations.size() > 0) {
-                return AjaxResult.warn("组织名重复！");
-            }
-            //判断该uid是否为总代
-            LambdaQueryWrapper<SmileUser> userLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            userLambdaQueryWrapper.eq(SmileUser::getUid,smileOrganization.getAgentId());
-            userLambdaQueryWrapper.eq(SmileUser::getDelTag,0);
-            userLambdaQueryWrapper.eq(SmileUser::getState,0);
-            SmileUser user = smileUserMapper.selectOne(userLambdaQueryWrapper);
-            if (user.getType()==1){
-                return AjaxResult.warn("该成员为其他组织总代！");
-            }
-
+        if (!StringUtils.isEmpty(smileOrganization.getAgentId()) && !StringUtils.isEmpty(oleOrganization.getAgentId()) && !oleOrganization.getAgentId().equals(smileOrganization.getAgentId())) {
+            //修改user信息
+            user.setType(1);
+            user.setOrgId(smileOrganization.getId());
+            user.setAgentId(smileOrganization.getAgentId());
+            smileUserMapper.updateById(user);
             //查询所有原总代的普代成员
             LambdaQueryWrapper<SmileUser> smileUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
             smileUserLambdaQueryWrapper.eq(SmileUser::getAgentId, oleOrganization.getAgentId());
@@ -141,11 +147,7 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
             oldSmileUsers.forEach(smileUser -> {
                 //修改缓存用户redis总代信息
                 SmileUserVO smileUserVO = smileRedisUtils.getSmileUserVO(smileUser.getUid());
-                if (oleOrganization.getAgentId().equals(smileUserVO.getUid())){
-                    smileUserVO.setType(2);
-                }else {
-                    smileUserVO.setType(smileUser.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);
@@ -162,14 +164,14 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
         }
         //只改名  或者原组织没有总代id
         oleOrganization.setName(smileOrganization.getName());
-        if (!StringUtils.isEmpty(smileOrganization.getAgentId())){
+        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);
+            LambdaQueryWrapper<SmileUser> smileUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            smileUserLambdaQueryWrapper.eq(SmileUser::getUid, smileOrganization.getAgentId());
+            smileUserLambdaQueryWrapper.eq(SmileUser::getDelTag, 0);
+            SmileUser smileUser = smileUserMapper.selectOne(smileUserLambdaQueryWrapper);
             smileUser.setType(1);
             smileUser.setOrgId(smileOrganization.getId());
             smileUserMapper.updateById(smileUser);