From 6d9782f697908a9573a0ad7c33ceb3a9d31c2a9b Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期四, 05 九月 2024 14:16:11 +0800
Subject: [PATCH] 代码优化
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrScheduleMapper.java | 2 +-
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleCtrl.java | 2 +-
pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml | 6 +++---
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/QueryVo.java | 3 ++-
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java | 1 +
pms-parent/pms-global/src/main/resources/mapper/PrScheduleMapper.xml | 2 +-
6 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrScheduleMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrScheduleMapper.java
index 333339e..88f0819 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrScheduleMapper.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrScheduleMapper.java
@@ -25,5 +25,5 @@
List<PrSchedule> selectSome(Map<String, Object> params);
- List<PrSchedule> selectAll(@Param("scheduleDate") String scheduleDate,@Param("userId") String userId);
+ List<PrSchedule> selectAll(@Param("scheduleDate") String scheduleDate,@Param("userId") Long userId);
}
\ No newline at end of file
diff --git a/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
index d128a39..ff7e942 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
@@ -189,7 +189,7 @@
<if test="password!= null and password !=''">
`password`,
</if>
- <if test="supperAdmin!= null and supperAdmin !=''">
+ <if test="supperAdmin!= null">
supper_admin,
</if>
<if test="disabled != null">
@@ -212,7 +212,7 @@
<if test="password!= null and password !=''">
#{password},
</if>
- <if test="supperAdmin!= null and supperAdmin !=''">
+ <if test="supperAdmin!= null">
#{supperAdmin},
</if>
<if test="disabled != null">
@@ -236,7 +236,7 @@
<if test="password!= null and password !=''">
`password` = #{password},
</if>
- <if test="supperAdmin!= null and supperAdmin !=''">
+ <if test="supperAdmin!= null">
supper_admin = #{supperAdmin},
</if>
<if test="disabled != null">
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrScheduleMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrScheduleMapper.xml
index 40353c9..49c527b 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrScheduleMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrScheduleMapper.xml
@@ -70,7 +70,7 @@
<if test="deleted != null">
#{deleted,jdbcType=TINYINT},
</if>
- <if test="dt != null">
+ <if test="dt != null and dt !=''">
#{dt,jdbcType=TIMESTAMP},
</if>
</trim>
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java
index cdd944b..7e5bd55 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java
@@ -95,6 +95,7 @@
po.supperAdmin = Constant.no.byteValue() ;
// po.disabled = false ;//榛樿涓嶇鐢�
po.deleted = false;//榛樿涓嶅垹闄�
+ po.supperAdmin = 0;//榛樿涓嶆槸绠＄悊鍛�
if (!StringUtils.isNullOrEmpty(po.password)) {
/*
濡傛灉鍓嶇杩涜浜哹ase64鍔犲瘑
diff --git a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/QueryVo.java b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/QueryVo.java
index 823ef81..527869b 100644
--- a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/QueryVo.java
+++ b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/QueryVo.java
@@ -12,5 +12,6 @@
public class QueryVo extends QueryConditionVo {
public String planName;
public String scheduleDate;
- public String userId;
+ public Long userId;
+
}
diff --git a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleCtrl.java b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleCtrl.java
index 13d8b48..33834e1 100644
--- a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleCtrl.java
+++ b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/schedule/ScheduleCtrl.java
@@ -98,7 +98,7 @@
@PostMapping(path="some")
@SsoPowerAop(power = "10200008")
@Log("鍒嗛〉鏌ヨ鎺掔彮")
- public BaseResponse<QueryResultVo<List<PrSchedule>>> some(@RequestBody com.dy.pmsProduct.schedule.QueryVo vo){
+ public BaseResponse<QueryResultVo<List<PrSchedule>>> some(@RequestBody QueryVo vo){
QueryResultVo<List<PrSchedule>> list = sv.selectSome(vo) ;
return BaseResponseUtils.buildSuccess(list);
}
--
Gitblit v1.8.0