exit

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

@@ -99,7 +99,7 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
             smileOrganizationMapper.insert(smileOrganization);
             return AjaxResult.success();
         }
-        return AjaxResult.warn("总代理不能为空或组织已添加");
+        return AjaxResult.warn("组织已添加");
     }
 
     @Override
@@ -112,14 +112,25 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
         SmileOrganization oleOrganization = smileOrganizationMapper.selectOne(lambdaQueryWrapper);
         //修改总代与原总代不同
         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());
+            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("该成员为其他组织总代！");
             }
+
             //查询所有原总代的普代成员
             LambdaQueryWrapper<SmileUser> smileUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
             smileUserLambdaQueryWrapper.eq(SmileUser::getAgentId, oleOrganization.getAgentId());