Explorar o código

合伙人删除,是推荐人不能删除

helixiao %!s(int64=2) %!d(string=hai) anos
pai
achega
30a343cf3a

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

@@ -242,7 +242,7 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
 
 
         }else {
-            if (sysAgencyLeader1.getSuggestId() == null && !sysAgencyLeaderDto.getSuggestId().isEmpty()) {
+            if (StringUtils.isNullOrEmpty(sysAgencyLeader1.getSuggestId()) && !sysAgencyLeaderDto.getSuggestId().isEmpty()) {
                 //之前推荐人为空。可以修改
                 SysAgencyLeader sysAgencyLeader = BeanUtil.copyProperties(sysAgencyLeaderDto, SysAgencyLeader.class);
                 sysAgencyLeader.setUpdateBy(loginId);

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

@@ -197,6 +197,15 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                 throw new DescribeException(sysPartner.getUserName() + "有推荐人,不允许删除");
             }
         }
+        List<SysRelationPerson> sysRelationPeople1 = sysRelationPersonMapper.selectList(new UpdateWrapper<SysRelationPerson>().lambda()
+                .eq(SysRelationPerson::getSuggestId, id)
+                .eq(SysRelationPerson::getDelFlag, 1)
+                .eq(SysRelationPerson::getType, 0));
+        if (sysRelationPeople1.size() > 0) {
+            if (sysRelationPeople1.get(0).getSuggestId() != null) {
+                throw new DescribeException(sysPartner.getUserName() + "是推荐人,不允许删除");
+            }
+        }
 
         SysPartner partner = new SysPartner();
         partner.setId(sysPartner.getId());