bug

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -140,10 +140,10 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
         verificationCity(taUser.getSelectCityTree(), taUser.getDefaultCityId());
 
         QueryWrapper<TaUser> wrapper = new QueryWrapper<>();
-        wrapper.eq("phone", taUser.getPhone()).or().eq("login_Name", taUser.getLoginName());
+        wrapper.eq("login_Name", taUser.getLoginName());
         List<TaUser> taUserList = this.list(wrapper);
         if (null != taUserList && taUserList.size() > 0) {
-            throw new Exception("电话号码或登录名重复");
+            throw new Exception("登录名重复");
         }
 
         //判断渠道端新增小程序最大数

src/main/java/com/huiju/estateagents/entity/TaBuildingApartment.java

@@ -77,6 +77,11 @@ public class TaBuildingApartment implements Serializable {
 
     private String houseType;
 
+    /**
+     * 权重
+     */
+    private Integer orderNo;
+
     /**
      * 户型图片列表
      */

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

@@ -259,6 +259,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         QueryWrapper<TaBuildingApartment> AppointmentQueryWrapper = new QueryWrapper<>();
         AppointmentQueryWrapper.eq("building_id", id);
         AppointmentQueryWrapper.eq("status", 1);
+        AppointmentQueryWrapper.orderByDesc("order_no");
         AppointmentQueryWrapper.orderByDesc("create_date");
         List<TaBuildingApartment> appoint = taBuildingApartmentMapper.selectList(AppointmentQueryWrapper);
         for (TaBuildingApartment apar : appoint) {
@@ -911,6 +912,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         // 楼盘户型
         QueryWrapper<TaBuildingApartment> buildingApartmentQueryWrapper = new QueryWrapper<>();
         buildingApartmentQueryWrapper.eq("building_id", building.getBuildingId());
+        buildingApartmentQueryWrapper.orderByDesc("order_no");
+        buildingApartmentQueryWrapper.orderByDesc("create_date");
         List<TaBuildingApartment> buildingApartmentList = taBuildingApartmentMapper.selectList(buildingApartmentQueryWrapper);
 
         // 楼盘户型图
@@ -934,6 +937,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         buildingApartmentQueryWrapper.eq("building_id", id);
         buildingApartmentQueryWrapper.eq("status", 1);
         buildingApartmentQueryWrapper.eq(org.apache.commons.lang3.StringUtils.isNotBlank(apartmentType), "apartment_type", apartmentType);
+        buildingApartmentQueryWrapper.orderByDesc("order_no");
         buildingApartmentQueryWrapper.orderByDesc("create_date");
         List<TaBuildingApartment> buildingApartment = taBuildingApartmentMapper.selectList(buildingApartmentQueryWrapper);
         buildingApartment.forEach(e -> {