解决冲突

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PeasantHouseholdServiceImpl.java

@@ -284,18 +284,20 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         List<PeasantHousehold> peasantHouseholds = this.query().eq("telephone", phoneNo).orderByDesc("rec_date").list();
         PeasantHousehold peasantHousehold = peasantHouseholds.size() > 0 ? peasantHouseholds.get(0) : null;
         // 没有注册过农户信息
-        boolean isNotFound = false;
         if (null == peasantHousehold) {
             peasantHousehold = new PeasantHousehold();
-            isNotFound = true;
-        }
-        PeasantHouseholdDto peasantHouseholdDto = buildDefaultPeasantHouseholdDto(wxDTO.getUserId(), wxDTO.getQrCodeType(), phoneNo);
-        BeanUtils.copyProperties(peasantHouseholdDto, peasantHousehold);
-        if (isNotFound) {
             peasantHousehold.setIsCertified(0);
             peasantHousehold.setSurveyOrNot(0);
             peasantHousehold.setReview(0);
         }
+        PeasantHouseholdDto peasantHouseholdDto = buildDefaultPeasantHouseholdDto(wxDTO.getUserId(), wxDTO.getQrCodeType(), phoneNo);
+        peasantHousehold.setDeveloperCode(peasantHouseholdDto.getDeveloperCode());// 开发方code
+        peasantHousehold.setDeveloperId(peasantHouseholdDto.getDeveloperId());// 开发方id
+        peasantHousehold.setDeveloperName(peasantHouseholdDto.getDeveloperName());// 开发方名称
+        peasantHousehold.setDeveloper(peasantHouseholdDto.getDeveloper());// 开发人
+        peasantHousehold.setRegionalCompaniesSeq(peasantHouseholdDto.getRegionalCompaniesSeq());
+        peasantHousehold.setRegionalCompaniesCode(peasantHouseholdDto.getRegionalCompaniesCode());
+        peasantHousehold.setRegionalCompaniesName(peasantHouseholdDto.getRegionalCompaniesName());
         PeasantHouseholdWxDto loginResult = doLogin(wxDTO);
         // 装载农户信息
         loginResult.setPeasantHousehold(peasantHousehold);