From b6471f2d1a2753e0a44aae480ffe733207c79c6a Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Mon, 14 Dec 2020 21:45:30 +0800
Subject: [PATCH] fix some bugs
---
zq-erp/src/main/java/com/matrix/system/hive/statistics/StatisticsBusinessDataJob.java | 2 +-
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html | 2 +-
zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml | 3 +--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/statistics/StatisticsBusinessDataJob.java b/zq-erp/src/main/java/com/matrix/system/hive/statistics/StatisticsBusinessDataJob.java
index 3d537da..ed112b3 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/statistics/StatisticsBusinessDataJob.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/statistics/StatisticsBusinessDataJob.java
@@ -79,7 +79,7 @@
Date today = new Date();
SysBusinessData sysBusinessData = new SysBusinessData();
- sysBusinessData.setTime(today);
+ sysBusinessData.setTime(DateUtil.getDateBefore(today,1));
businessDataDao.deleteByModel(sysBusinessData);
List<SysShopInfo> sysShopInfos = shopInfoDao.selectShopInfo(null);
diff --git a/zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml b/zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml
index 05a7862..321834c 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml
@@ -1273,7 +1273,7 @@
<select id="selectByRoleName" resultMap="SysUsersMap">
SELECT
- a.*
+ distinct a.*
FROM
sys_users a
LEFT JOIN sys_role r ON FIND_IN_SET(r.role_id, a.role_ids)
@@ -1290,7 +1290,6 @@
<if test="users.shopId !=null and users.shopId !=''">
AND a.SHOP_ID = #{users.shopId}
</if>
-
ORDER BY
a.SIGN_ORDER IS NULL,
a.SIGN_ORDER
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
index b1890a5..43e5f22 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
@@ -566,7 +566,7 @@
//获取用户列表
AjaxProxy.requst({
app: _this,
- url: basePath + '/admin/getShopStaffByRoleName?roleName=美疗师',
+ url: basePath + '/admin/shopAll',
callback: function (data) {
_this.userList = data.rows;
}
--
Gitblit v1.9.1