exit

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

@@ -127,16 +127,17 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
         LambdaQueryWrapper<SmileUser> userLambdaQueryWrapper = new LambdaQueryWrapper<>();
         userLambdaQueryWrapper.eq(SmileUser::getUid, smileOrganization.getAgentId());
         userLambdaQueryWrapper.eq(SmileUser::getDelTag, 0);
-        userLambdaQueryWrapper.eq(SmileUser::getState, 0);
         userLambdaQueryWrapper.in(SmileUser::getType, 1, 2);
         SmileUser user = smileUserMapper.selectOne(userLambdaQueryWrapper);
-        if (user != null && user.getType() == 1) {
+        if (user != null && user.getType().equals(1)) {
             if (user.getOrgId().equals(oleOrganization.getId())) {
                 return AjaxResult.warn("该成员为该组总代！");
             }
             return AjaxResult.warn("该成员为其他组织总代！");
         } else if (user == null) {
             return AjaxResult.warn("用户不存在！");
+        }else if (user.getType().equals(2) && user.getState().equals(1)){
+            return AjaxResult.warn("该用户已被黑！");
         }
         //修改总代与原总代不同
         if (!StringUtils.isEmpty(smileOrganization.getAgentId()) && !StringUtils.isEmpty(oleOrganization.getAgentId()) && !oleOrganization.getAgentId().equals(smileOrganization.getAgentId())) {