diff --git a/guns-admin/src/main/java/cn/enilu/guns/admin/modular/system/controller/UserMgrController.java b/guns-admin/src/main/java/cn/enilu/guns/admin/modular/system/controller/UserMgrController.java index 48111154..45ae6858 100644 --- a/guns-admin/src/main/java/cn/enilu/guns/admin/modular/system/controller/UserMgrController.java +++ b/guns-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 index 2216feda..a1712a2e 100644 --- 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,5 +1,6 @@ package cn.enilu.guns.bean.vo; +import lombok.Data; import lombok.Getter; import lombok.Setter; @@ -7,8 +8,7 @@ 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 index 98ec22d5..dfdc6953 100644 --- 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 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 index 874b3122..2fe4a234 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ 4.0.0 2.3.2 1.0.0 - 1.16.20 + 1.18.2 @@ -71,7 +71,7 @@ org.projectlombok lombok - compile + provided ${lombok.version}