Просмотр исходного кода

Merge branch 'release_toaliyun_real' of http://221.219.212.246:13000/server/formallProject into release_toaliyun_real

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
258782fbd4
2 измененных файлов: 4 добавлений и 4 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java
  2. +3
    -3
      mallinkService/src/main/resources/mapper/WxShopMapper.xml

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java Просмотреть файл

@@ -181,7 +181,7 @@ public class WxShopController extends BaseController {
wxShop = new WxShop(); wxShop = new WxShop();
} }
wxShop.updateTenantInfo(getTenantInfo()); wxShop.updateTenantInfo(getTenantInfo());
wxShop.setSortColumns(BaseEntity.SortField.SCreateDate_DESC,BaseEntity.SortField.SId_DESC);
//wxShop.setSortColumns(BaseEntity.SortField.SCreateDate_DESC,BaseEntity.SortField.SId_DESC);


final PageInfo<Map<String, Object>> page = wxShopService.notRentListMapAsPage(wxShop, pageNum, pageSize); final PageInfo<Map<String, Object>> page = wxShopService.notRentListMapAsPage(wxShop, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);


+ 3
- 3
mallinkService/src/main/resources/mapper/WxShopMapper.xml Просмотреть файл

@@ -245,7 +245,7 @@


</select> </select>


<select id="notRentListMapAsPage" parameterType="com.iformall.domain.po.WxShop" resultType="hashmap">
<select id="notRentListMapAsPage" parameterType="com.iformall.domain.po.WxShop" resultType="java.util.HashMap">
select s.id as id, s.tenant_id tenantId, s.parent_tenant_id parentTenantId, s.shop_number shopNumber,CONVERT(s.build_area,SIGNED) buildArea, select s.id as id, s.tenant_id tenantId, s.parent_tenant_id parentTenantId, s.shop_number shopNumber,CONVERT(s.build_area,SIGNED) buildArea,
s.img_url imgUrl,CONVERT(s.operation_area,SIGNED) operationArea, s.img_url imgUrl,CONVERT(s.operation_area,SIGNED) operationArea,
s.status,b.building_name building,f.floor_name floor,s.manager,s.manager_phone managerPhone, s.status,b.building_name building,f.floor_name floor,s.manager,s.manager_phone managerPhone,
@@ -255,7 +255,7 @@
left join wx_mall_floor f on s.floor=f.id left join wx_mall_floor f on s.floor=f.id
where s.is_del=0 where s.is_del=0


<if test=" null != id ">
<!--<if test=" null != id ">
and s.`id` = #{id} and s.`id` = #{id}
</if> </if>


@@ -283,7 +283,7 @@
</if> </if>
<if test="null == sortColumn"> <if test="null == sortColumn">
<if test=" null != sortColumns">order by ${sortColumns}</if> <if test=" null != sortColumns">order by ${sortColumns}</if>
</if>
</if>-->
</select> </select>






Загрузка…
Отмена
Сохранить