exit 用户查询，修改总代

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

@@ -110,15 +110,14 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
         lambdaQueryWrapper.eq(SmileOrganization::getId, smileOrganization.getId());
         lambdaQueryWrapper.eq(SmileOrganization::getDelTag, 0);
         SmileOrganization oleOrganization = smileOrganizationMapper.selectOne(lambdaQueryWrapper);
-        smileOrganizationMapper.updateById(smileOrganization);
         //修改总代与原总代不同
-        if (!oleOrganization.getAgentId().equals(smileOrganization.getAgentId())) {
+        if (!StringUtils.isEmpty(smileOrganization.getAgentId()) && !oleOrganization.getAgentId().equals(smileOrganization.getAgentId())) {
             //判断该uid是否为总代
             LambdaQueryWrapper<SmileOrganization> organizationQueryWrapper = new LambdaQueryWrapper<>();
             organizationQueryWrapper.eq(SmileOrganization::getAgentId, smileOrganization.getAgentId());
             organizationQueryWrapper.eq(SmileOrganization::getDelTag, 0);
             List<SmileOrganization> smileOrganizations = smileOrganizationMapper.selectList(organizationQueryWrapper);
-            if (smileOrganizations!=null && smileOrganizations.size()>0){
+            if (smileOrganizations != null && smileOrganizations.size() > 0) {
                 return AjaxResult.warn("该成员为其他组织总代！");
             }
             //查询所有原总代的普代成员
@@ -142,6 +141,7 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
                 smileUserMapper.updateById(smileUser);
             });
         }
+        smileOrganizationMapper.updateById(smileOrganization);
         return AjaxResult.success();
     }
 

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileUserMapper.xml

@@ -45,7 +45,7 @@
     <select id="selectUserList" parameterType="java.util.Map" resultType="com.liquidnet.service.smile.entity.SmileUser">
         select * from smile_user
         <where>
-            del_tag = 0 AND type in (1,2,5)
+            del_tag = 0 AND type in (1,2,5) and state = 0
             <if test="phone!='' and phone !=null">
                 AND phone Like concat('%',#{phone},'%')
             </if>