xzx.git - Gitblit

			@@ -38,7 +38,8 @@
			public Map<String, Object> queryOrderList(QueryJhyOrderListDto model) {
			PageHelper.startPage(model.getPage(), model.getLimit());
			String accountPhone = model.getAccount();
			String name = StrUtil.isEmpty(model.getAccount())?model.getAccount():StringUtils.encode(model.getAccount());
			// String name = StrUtil.isEmpty(model.getAccount())?model.getAccount():StringUtils.encode(model.getAccount());
			String name = model.getAccount();
			model.setAccount(name);
			model.setAccountPhone(accountPhone);
			List<QueryJhyOrderListVo> maps = jhyOrderMapper.queryOrderList(model);

			@@ -32,7 +32,7 @@
			and d.username like concat('%',#{record.jwyName},'%')
			</if>
			<if test="record.account != null and record.account != ''">
			and ( b.nick_name like concat('%',#{record.account},'%')
			and ( a.username like concat('%',#{record.account},'%')
			or b.mobile_phone like concat('%',#{record.accountPhone},'%') )
			</if>
			<if test="record.reserveTimeStart != null">

	gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java	3 ●●●●● patch \| view \| raw \| blame \| history
	gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml	2 ●●●●● patch \| view \| raw \| blame \| history