From 35357261f2cf942b08f1d4bfb71de6f482d65af8 Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Mon, 8 Mar 2021 09:56:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA111aaa?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/msdw/tms/common/utils/ConstantUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/msdw/tms/common/utils/ConstantUtils.java b/src/main/java/com/msdw/tms/common/utils/ConstantUtils.java index c5a9703..0f8cf94 100644 --- a/src/main/java/com/msdw/tms/common/utils/ConstantUtils.java +++ b/src/main/java/com/msdw/tms/common/utils/ConstantUtils.java @@ -32,5 +32,5 @@ public class ConstantUtils { //用户初始密码 - public static final String INITIAL_PASSWORD = "huoran123"; + public static final String INITIAL_PASSWORD = "111aaa"; } From f447e779abe22bfadfe2383b4ea9dec13aaf7723 Mon Sep 17 00:00:00 2001 From: "jiakun.lin" Date: Mon, 8 Mar 2021 11:27:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/tms/AchievementManagementDao.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/resources/mapper/tms/AchievementManagementDao.xml b/src/main/resources/mapper/tms/AchievementManagementDao.xml index 6be9400..44c9e9e 100644 --- a/src/main/resources/mapper/tms/AchievementManagementDao.xml +++ b/src/main/resources/mapper/tms/AchievementManagementDao.xml @@ -418,7 +418,6 @@ FROM hr_project_management hpm WHERE systemId = #{systemId} - AND hpm.isdel = 0 AND hpm.projectPermissions = #{projectPermissions} and hpm.projectName like concat('%',#{searchContant},'%') From b94fb43240d823b69d967610a24121b9a33c4d6d Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Tue, 9 Mar 2021 14:23:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/msdw/tms/entity/response/ResponseResult.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/msdw/tms/entity/response/ResponseResult.java b/src/main/java/com/msdw/tms/entity/response/ResponseResult.java index 2b2464b..45a6820 100644 --- a/src/main/java/com/msdw/tms/entity/response/ResponseResult.java +++ b/src/main/java/com/msdw/tms/entity/response/ResponseResult.java @@ -24,7 +24,7 @@ public class ResponseResult { /** * 状态码 */ - private int code; + private int status; /** * 返回的数据 @@ -36,15 +36,15 @@ public class ResponseResult { */ private String message; - public ResponseResult(boolean success, int code, String message) { + public ResponseResult(boolean success, int status, String message) { this.success = success; - this.code = code; + this.status = status; this.message = message; } public ResponseResult(ResultCode resultCode) { this.success = resultCode.success(); - this.code = resultCode.code(); + this.status = resultCode.code(); this.message = resultCode.message(); } @@ -68,8 +68,8 @@ public class ResponseResult { return new ResponseResult(CommonCode.FAIL); } - public static ResponseResult FAIL(int code, String message) { - return new ResponseResult<>(false, code, null, message); + public static ResponseResult FAIL(int status, String message) { + return new ResponseResult<>(false, status, null, message); } }