Merge remote-tracking branch 'origin/master'

linwei

2024-01-03 c4fb77c78f0617abdf117ca135dfee519f0bca51

 src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java

@@ -423,6 +423,8 @@
                  UserHouseLabelEntity userHouseLabelEntity = new UserHouseLabelEntity();
                  userHouseLabelEntity.setLabelId(BigDecimal.valueOf(one1.getId()).longValue());
                  userHouseLabelEntity.setHouseholdId(householdEntity.getId());
                  // 设置默认的绿色
                  userHouseLabelEntity.setColor("#30D17C");
                  userHouseLabelEntity.setLableType(1);
                  userHouseLabelEntity.setLabelName(s);
                  userHouseLabelEntity.setHouseCode(houseAndHoldExcel.getHouseCode());
@@ -475,7 +477,7 @@
         }
         // 户籍类型
         if (!Strings.isBlank(houseAndHoldExcel.getResidentType())){
            one.setResidentType(Integer.parseInt(houseAndHoldExcel.getResidentType()));
            one.setResidentType(Integer.parseInt(houseAndHoldExcel.getResidentType().trim()));
         }
         // 户籍地区县
         if (!Strings.isBlank(houseAndHoldExcel.getResidentAdcode())){
@@ -553,6 +555,8 @@
                  userHouseLabelEntity.setHouseholdId(one.getId());
                  userHouseLabelEntity.setLableType(1);
                  userHouseLabelEntity.setLabelName(s);
                  // 设置默认的绿色
                  userHouseLabelEntity.setColor("#30D17C");
                  userHouseLabelEntity.setHouseCode(houseAndHoldExcel.getHouseCode());
                  bean.save(userHouseLabelEntity);
               }