党组织新增报错

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java

@@ -99,8 +99,8 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl<IcPartyOrgDao, IcPart
     @Transactional(rollbackFor = Exception.class)
     public Result save(IcPartyOrgDTO dto) {
         //同一个客户下，名称和编码不可重复
-        IcPartyOrgEntity repeatName = baseDao.selectByCuIdAndNameOrCode(dto.getPartyOrgName(), null, dto.getCustomerId());
-        if (null != repeatName) {
+//        IcPartyOrgEntity repeatName = baseDao.selectByCuIdAndNameOrCode(dto.getPartyOrgName(), null, dto.getCustomerId());
+       /* if (null != repeatName) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"partyOrgName重复","行政组织名称不可重复！");
         }
         if (StringUtils.isNotBlank(dto.getPartyOrgCode())) {
@@ -108,7 +108,7 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl<IcPartyOrgDao, IcPart
             if (null != repeatCode) {
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"partyOrgCode重复","行政组织编码不可重复！");
             }
-        }
+        }*/
         IcPartyOrgEntity parentOrg = baseDao.selectById(dto.getOrgPid());
         //判断当前党组织的类型是否是所选上级党组织类型的直接下级
         if ("0".equals(dto.getOrgPid())) {

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/YiFengScreenServiceImpl.java

@@ -20,6 +20,7 @@ import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.modules.partyOrg.dao.IcPartyActDao;
 import com.epmet.modules.partyOrg.dao.IcPartyActTypeDictDao;
 import com.epmet.modules.partyOrg.dao.IcPartyOrgDao;
+import com.epmet.modules.partyOrg.dao.ResiPartymemberAttachmentDao;
 import com.epmet.modules.partyOrg.entity.IcPartyActEntity;
 import com.epmet.modules.partyOrg.entity.IcPartyActTypeDictEntity;
 import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity;
@@ -64,6 +65,8 @@ public class YiFengScreenServiceImpl implements YiFengScreenService, ResultDataR
 
     @Autowired
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+    @Autowired
+    private ResiPartymemberAttachmentDao resiPartymemberAttachmentDao;
 
     @Override
     public List<YiFengScreenPartyOrgCategoryResultDTO> listPartyOrgCategoryAndQuantity(String agencyId) {
@@ -409,9 +412,9 @@ public class YiFengScreenServiceImpl implements YiFengScreenService, ResultDataR
             });
         }*/
 
-/*        pageInfo.getList().forEach(l->{
+        pageInfo.getList().forEach(l->{
             l.setAttachments(resiPartymemberAttachmentDao.selectListByBusinessId(l.getIcPartyActId()));
-        });*/
+        });
 
         return new PageData<>(pageInfo.getList(), pageInfo.getTotal());
     }