Forráskód Böngészése

处理没有推荐人的情况

helixiao 2 éve
szülő
commit
f093b3e1ec

+ 28 - 26
src/main/java/com/ydtech/modules/admin/service/impl/SysAgencyLeaderServiceImpl.java

@@ -105,33 +105,35 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
         sysAgencyLeader.setCreateTime(new Date());
         SysUser user = BaseController.getUser();
         sysAgencyLeader.setCreateBy(user.getId());
-        sysAgencyLeaderMapper.insert(sysAgencyLeader);
-        //sysRelationPerson1为空是无上级
-        SysRelationPerson sysRelationPerson = new SysRelationPerson();
-        sysRelationPerson.setAgencyLeaderId(sysAgencyLeader.getUserId());
-        sysRelationPerson.setCreateBy(user.getId());
-        sysRelationPerson.setCreateTime(new Date());
-        sysRelationPerson.setSuggestId(sysAgencyLeaderDto.getSuggestId());
-        sysRelationPerson.setSource(0);
-        sysRelationPerson.setType(1);
-        boolean b = sysRelationPersonMapper.insert(sysRelationPerson) > 0;
-        //查询推荐人是否有上级 :满足合伙人有多层关系
-        List<SysRelationPerson> sysRelationPersonList = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
-                .eq(SysRelationPerson::getAgencyLeaderId, sysAgencyLeaderDto.getSuggestId())
-                .eq(SysRelationPerson::getType, 0));
-
-        if (sysRelationPersonList.size() > 0) {
-            for (SysRelationPerson sysRelation : sysRelationPersonList) {
-                SysRelationPerson sysRelationPerson1 = new SysRelationPerson();
-                sysRelationPerson1.setAgencyLeaderId(sysAgencyLeader.getUserId());
-                sysRelationPerson1.setCreateBy(user.getId());
-                sysRelationPerson1.setCreateTime(new Date());
-                sysRelationPerson1.setSuggestId(sysRelation.getSuggestId());
-                sysRelationPerson1.setSource(1);
-                sysRelationPerson1.setType(1);
-                sysRelationPersonMapper.insert(sysRelationPerson1);
-            }
+        boolean b = sysAgencyLeaderMapper.insert(sysAgencyLeader) > 0;
+        if (!StringUtils.isNullOrEmpty(sysAgencyLeaderDto.getSuggestId())) {
+            //sysRelationPerson1为空是无上级
+            SysRelationPerson sysRelationPerson = new SysRelationPerson();
+            sysRelationPerson.setAgencyLeaderId(sysAgencyLeader.getUserId());
+            sysRelationPerson.setCreateBy(user.getId());
+            sysRelationPerson.setCreateTime(new Date());
+            sysRelationPerson.setSuggestId(sysAgencyLeaderDto.getSuggestId());
+            sysRelationPerson.setSource(0);
+            sysRelationPerson.setType(1);
+            b = sysRelationPersonMapper.insert(sysRelationPerson) > 0;
+            //查询推荐人是否有上级 :满足合伙人有多层关系
+            List<SysRelationPerson> sysRelationPersonList = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
+                    .eq(SysRelationPerson::getAgencyLeaderId, sysAgencyLeaderDto.getSuggestId())
+                    .eq(SysRelationPerson::getType, 0));
+
+            if (sysRelationPersonList.size() > 0) {
+                for (SysRelationPerson sysRelation : sysRelationPersonList) {
+                    SysRelationPerson sysRelationPerson1 = new SysRelationPerson();
+                    sysRelationPerson1.setAgencyLeaderId(sysAgencyLeader.getUserId());
+                    sysRelationPerson1.setCreateBy(user.getId());
+                    sysRelationPerson1.setCreateTime(new Date());
+                    sysRelationPerson1.setSuggestId(sysRelation.getSuggestId());
+                    sysRelationPerson1.setSource(1);
+                    sysRelationPerson1.setType(1);
+                    b =sysRelationPersonMapper.insert(sysRelationPerson1)>0;
+                }
 
+            }
         }
         return b;
     }

+ 1 - 1
src/main/java/com/ydtech/modules/admin/service/impl/SysPartnerServiceImpl.java

@@ -443,7 +443,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                 .eq(SysPartner::getDelFlag, 1).eq(SysPartner::getUserId, sysPartnerDto.getUserId()));
         if (sysPartner == null) throw new DescribeException("系统错误,请联系管理员!");
 
-        if (sysPartner.getSuggestId() == null && !sysPartnerDto.getSuggestId().isEmpty()) {
+        if (StringUtils.isNullOrEmpty(sysPartner.getSuggestId()) && StringUtils.isNotEmpty(sysPartnerDto.getSuggestId())) {
             SysPartner partner = new SysPartner();
             partner.setId(sysPartner.getId());
             partner.setProportional(sysPartnerDto.getProportional());