Merge branch 'master' of https://git.czcyedu.com/huoran/msdw_tms

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";
 }

src/main/java/com/msdw/tms/entity/response/ResponseResult.java

@@ -24,7 +24,7 @@ public class ResponseResult<T> {
     /**
      * 状态码
      */
-    private int code;
+    private int status;
 
     /**
      * 返回的数据
@@ -36,15 +36,15 @@ public class ResponseResult<T> {
      */
     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<T> {
         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);
     }
 
 }

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}
 
         <if test="searchContant!=null and searchContant!=''">and hpm.projectName like concat('%',#{searchContant},'%')