Change 升级lombok

enilu · Oct 9, 2019 · 879767d · 879767d
1 parent e25789d
commit 879767d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/...-admin/src/main/java/cn/enilu/guns/admin/modular/system/controller/UserMgrController.java b/...-admin/src/main/java/cn/enilu/guns/admin/modular/system/controller/UserMgrController.java
@@ -253,7 +253,7 @@ public Tip delete(@RequestParam Long userId) {
             throw new GunsException(BizExceptionEnum.REQUEST_NULL);
         }
         //不能删除超级管理员
-        if (userId.equals(Const.ADMIN_ID)) {
+        if (userId.intValue() ==  Const.ADMIN_ID.intValue()) {
             throw new GunsException(BizExceptionEnum.CANT_DELETE_ADMIN);
         }
         assertAuth(userId);

diff --git a/guns-entity/src/main/java/cn/enilu/guns/bean/vo/QuartzJob.java b/guns-entity/src/main/java/cn/enilu/guns/bean/vo/QuartzJob.java
@@ -1,14 +1,14 @@
 package cn.enilu.guns.bean.vo;
 
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Map;
 
-@Getter
-@Setter
+@Data
 public class QuartzJob implements Serializable {
 	private String jobId;
 	private String jobName;

diff --git a/guns-service/src/main/java/cn/enilu/guns/warpper/DeptWarpper.java b/guns-service/src/main/java/cn/enilu/guns/warpper/DeptWarpper.java
@@ -22,7 +22,7 @@ public void warpTheMap(Map<String, Object> map) {
 
         Long pid = (Long) map.get("pid");
 
-        if (ToolUtil.isEmpty(pid) || pid.equals(0)) {
+        if (ToolUtil.isEmpty(pid) || pid.intValue() == 0) {
             map.put("pName", "--");
         } else {
             map.put("pName", ConstantFactory.me().getDeptName(pid));

diff --git a/pom.xml b/pom.xml
@@ -57,7 +57,7 @@
         <hutool.version>4.0.0</hutool.version>
         <kaptcha.version>2.3.2</kaptcha.version>
         <github.kaptcha.version>1.0.0</github.kaptcha.version>
-        <lombok.version>1.16.20</lombok.version>
+        <lombok.version>1.18.2</lombok.version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -71,7 +71,7 @@
             <dependency>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>
-                <scope>compile</scope>
+                <scope>provided</scope>
                 <version>${lombok.version}</version>
             </dependency>