From 2c76124f035c6d6d6926930ffa13f7cbd7702fbd Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Fri, 2 Dec 2022 09:49:21 +0800 Subject: [PATCH] =?UTF-8?q?fix=E9=83=A8=E9=97=A8=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/modules/common/base/BaseDTO.java | 6 +-- .../org/nl/modules/system/domain/Dept.java | 10 ++-- .../org/nl/modules/system/domain/User.java | 3 +- .../nl/modules/system/domain/vo/DeptVo.java | 9 +++- .../system/service/dto/DeptQueryCriteria.java | 2 +- .../system/service/dto/UserDetail.java | 2 +- .../system/service/impl/DeptServiceImpl.java | 7 ++- .../system/service/impl/UserServiceImpl.java | 4 +- .../src/main/java/org/nl/sso/wql/SYS_DEPT.wql | 3 ++ nladmin-ui/src/views/system/dept/index.vue | 47 ++++++++++--------- 10 files changed, 54 insertions(+), 39 deletions(-) diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/base/BaseDTO.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/base/BaseDTO.java index 60e4a08..644d8b1 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/base/BaseDTO.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/base/BaseDTO.java @@ -1,5 +1,6 @@ package org.nl.modules.common.base; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,15 +19,14 @@ public class BaseDTO implements Serializable { private Long create_id; - private String update_optname; private Long update_optid; - + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date create_time; - + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date update_time; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/domain/Dept.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/domain/Dept.java index a4684fa..92cf0d3 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/domain/Dept.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/domain/Dept.java @@ -19,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; +import org.nl.modules.common.base.BaseDTO; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -32,24 +33,25 @@ import java.util.Set; */ @Getter @Setter -public class Dept implements Serializable { +public class Dept extends BaseDTO implements Serializable { - private Long id; - private Long dept_id; @ApiModelProperty(value = "排序") private Integer dept_sort; + @NotBlank @ApiModelProperty(value = "部门名称") private String name; + + @NotNull @ApiModelProperty(value = "是否启用") - private Boolean is_used; + private String is_used; @ApiModelProperty(value = "上级部门") private Long pid; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/domain/User.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/domain/User.java index 7604568..a7f34d1 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/domain/User.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/domain/User.java @@ -18,6 +18,7 @@ package org.nl.modules.system.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; +import org.nl.modules.common.base.BaseDTO; import javax.validation.constraints.NotNull; import java.io.Serializable; @@ -29,7 +30,7 @@ import java.util.Date; */ @Getter @Setter -public class User implements Serializable { +public class User extends BaseDTO implements Serializable { @ApiModelProperty(value = "ID", hidden = true) diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/domain/vo/DeptVo.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/domain/vo/DeptVo.java index f7ae6da..2cf9569 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/domain/vo/DeptVo.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/domain/vo/DeptVo.java @@ -15,14 +15,17 @@ */ package org.nl.modules.system.domain.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; +import org.nl.modules.common.base.BaseDTO; import org.nl.modules.system.service.dto.MenuDto; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.Date; import java.util.List; /** @@ -31,7 +34,7 @@ import java.util.List; */ @Getter @Setter -public class DeptVo implements Serializable { +public class DeptVo extends BaseDTO implements Serializable { private Long dept_id; @@ -39,13 +42,14 @@ public class DeptVo implements Serializable { @ApiModelProperty(value = "排序") private Integer dept_sort; + @NotBlank @ApiModelProperty(value = "部门名称") private String name; @NotNull @ApiModelProperty(value = "是否启用") - private Boolean is_used; + private String is_used; @ApiModelProperty(value = "上级部门") private Long pid; @@ -55,6 +59,7 @@ public class DeptVo implements Serializable { //前端显示 private Boolean hasChildren =Boolean.FALSE; + private List children; public void setSub_count(Integer sub_count) { diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/dto/DeptQueryCriteria.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/dto/DeptQueryCriteria.java index a1108e8..39fdcfc 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/dto/DeptQueryCriteria.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/dto/DeptQueryCriteria.java @@ -36,7 +36,7 @@ public class DeptQueryCriteria{ private String code; @Query - private Boolean is_used; + private String is_used; @Query private Long pid; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/dto/UserDetail.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/dto/UserDetail.java index 265ac7e..c66032b 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/dto/UserDetail.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/dto/UserDetail.java @@ -78,7 +78,7 @@ public class UserDetail implements Serializable { private String extuser_id; - private Boolean is_used; + private String is_used; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DeptServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DeptServiceImpl.java index 4bdc082..6fec87c 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DeptServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DeptServiceImpl.java @@ -23,6 +23,7 @@ import cn.hutool.db.Entity; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.serializer.SerializerFeature; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import org.nl.modules.common.exception.BadRequestException; @@ -143,7 +144,9 @@ public class DeptServiceImpl implements DeptService { } Dept dept = findById(resources.getDept_id()); resources.setDept_id(dept.getDept_id()); - WQLObject.getWQLObject("sys_dept").update((JSONObject)JSON.toJSON(resources),"dept_id = '"+resources.getDept_id()+"'"); + +// WQLObject.getWQLObject("sys_dept").update((JSONObject)JSON.toJSON(resources),"dept_id = '"+resources.getDept_id()+"'"); + WQLObject.getWQLObject("sys_dept").update(JSONObject.parseObject(JSON.toJSONString(resources)),"dept_id = '"+resources.getDept_id()+"'"); // 更新父节点中子节点数目 updateSubCnt(oldPid); updateSubCnt(newPid); @@ -272,7 +275,7 @@ public class DeptServiceImpl implements DeptService { public List getDeptChildren(List deptList) { List list = new ArrayList<>(); deptList.forEach(dept -> { - if (dept != null && dept.getIs_used()) { + if (dept != null && "1".equals(dept.getIs_used())) { List depts = findByPid(dept.getDept_id()); if (deptList.size() != 0) { list.addAll(getDeptChildren(depts)); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java index 0208caa..8314100 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java @@ -151,7 +151,7 @@ public class UserServiceImpl implements UserService { onlineUserService.kickOutForUsername(resources.getUsername()); } resources.setPassword(SaSecureUtil.md5BySalt(resources.getPassword(), "salt")); - WQLObject.getWQLObject("sys_user").update((JSONObject)JSON.toJSON(resources),"user_id ='"+resources.getUser_id()+"'"); + WQLObject.getWQLObject("sys_user").update(JSONObject.parseObject(JSON.toJSONString(resources)),"user_id ='"+resources.getUser_id()+"'"); // 清除缓存 delCaches(user.getUser_id(), user.getUsername()); //更新部门用户 @@ -171,7 +171,7 @@ public class UserServiceImpl implements UserService { user.setPerson_name(resources.getPerson_name()); user.setPhone(resources.getPhone()); user.setGender(resources.getGender()); - WQLObject.getWQLObject("sys_user").update((JSONObject)JSON.toJSON(resources),"user_id ='"+resources.getUser_id()+"'"); + WQLObject.getWQLObject("sys_user").update(JSONObject.parseObject(JSON.toJSONString(resources)),"user_id ='"+resources.getUser_id()+"'"); // 清理缓存 delCaches(user.getUser_id(), user.getUsername()); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/sso/wql/SYS_DEPT.wql b/nladmin-system/nlsso-server/src/main/java/org/nl/sso/wql/SYS_DEPT.wql index 71944a5..ded4766 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/sso/wql/SYS_DEPT.wql +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/sso/wql/SYS_DEPT.wql @@ -62,6 +62,9 @@ OPTION 输入.code <> "" code = 输入.code ENDOPTION + OPTION 输入.is_used <> "" + is_used = 输入.is_used + ENDOPTION OPTION 输入.pidIsNull <> "" pid is null ENDOPTION diff --git a/nladmin-ui/src/views/system/dept/index.vue b/nladmin-ui/src/views/system/dept/index.vue index 4cb5530..2c63942 100644 --- a/nladmin-ui/src/views/system/dept/index.vue +++ b/nladmin-ui/src/views/system/dept/index.vue @@ -14,7 +14,7 @@ @keyup.enter.native="crud.toQuery" /> - @@ -101,23 +101,21 @@ - - + + - - - + { - debugger + crudDept.getDeptvo({ is_used: '1' }).then(res => { this.depts = res.content.map(function(obj) { if (obj.hasChildren) { obj.children = null @@ -248,11 +244,9 @@ export default { // 获取弹窗内部门数据 loadDepts({ action, parentNode, callback }) { if (action === LOAD_CHILDREN_OPTIONS) { - crudDept.getDepts({ enabled: true, pid: parentNode.id }).then(res => { + crudDept.getDeptvo({ is_used: '1', pid: parentNode.dept_id }).then(res => { parentNode.children = res.content.map(function(obj) { - if (obj.hasChildren) { - obj.children = null - } + obj.children = null return obj }) setTimeout(() => { @@ -294,6 +288,13 @@ export default { }, checkboxT(row, rowIndex) { return row.id !== 1 + }, + normalizer(node) { + return { + id: node.dept_id, + label: node.name, + children: node.children + } } } }