From 3861acdfefb93e2b833634915933237ec30902eb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 16 八月 2023 14:12:57 +0800
Subject: [PATCH] 修復bug
---
server/src/main/resources/mappers/WorkorderRecordExtMapper.xml | 4 ++--
server/src/main/java/doumeemes/config/shiro/ShiroRealm.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/server/src/main/java/doumeemes/config/shiro/ShiroRealm.java b/server/src/main/java/doumeemes/config/shiro/ShiroRealm.java
index ab1dcf7..3db5c23 100644
--- a/server/src/main/java/doumeemes/config/shiro/ShiroRealm.java
+++ b/server/src/main/java/doumeemes/config/shiro/ShiroRealm.java
@@ -131,9 +131,9 @@
if(com == null){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヨ处鎴峰紓甯革紒");
}
-// if(Constants.equalsInteger( com.getStatus(),Constants.ZERO) ){
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヤ紒涓氬凡杩囩鐢紒");
-// }
+ if(Constants.equalsInteger( com.getStatus(),Constants.ZERO) ){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヤ紒涓氬凡杩囩鐢紒");
+ }
if(com.getOepnValidDate() != null && com.getOepnValidDate().before(new Date())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヤ紒涓氬凡杩囦娇鐢ㄦ湁鏁堟湡锛�");
}
diff --git a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
index c8fb3d7..f4c1edd 100644
--- a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
@@ -479,10 +479,10 @@
AND `CREATE_USER` = #{userId}
</if>
<if test="startDate != null">
- AND a.`CREATE_TIME` >= #{startDate}
+ AND `CREATE_TIME` >= #{startDate}
</if>
<if test="endDate != null">
- AND #{endDate} >= a.`CREATE_TIME`
+ AND #{endDate} >= `CREATE_TIME`
</if>
group by `CREATE_USER`
<!-- order by `CREATE_TIME` desc-->
--
Gitblit v1.9.3