From 340a02bfc7822193183f9fcd0635f46b89a9eb54 Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 15 Dec 2022 14:19:43 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E6=9B=B4=E6=96=B0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=90=8C=E6=AD=A5=E6=B7=BB=E5=8A=A0=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/auth/AuthAdminController.java | 25 +++++++++++++++++-- .../com/glxp/api/admin/dao/auth/DeptDao.java | 1 + .../admin/req/auth/AuthAdminQueryRequest.java | 5 ++++ .../api/admin/service/auth/DeptService.java | 1 + .../service/auth/impl/DeptServiceImpl.java | 5 ++++ .../mybatis/mapper/auth/AuthAdminDao.xml | 3 +++ .../resources/mybatis/mapper/auth/DeptDao.xml | 3 +++ 7 files changed, 41 insertions(+), 2 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java index d7a6bd2a..d490537d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java @@ -1,10 +1,12 @@ package com.glxp.api.admin.controller.auth; +import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.admin.annotation.AuthRuleAnnotation; import com.glxp.api.admin.entity.auth.AuthAdmin; import com.glxp.api.admin.entity.auth.AuthRole; import com.glxp.api.admin.entity.auth.AuthRoleAdmin; +import com.glxp.api.admin.entity.auth.DeptEntity; import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.api.admin.req.auth.AuthAdminQueryRequest; import com.glxp.api.admin.req.auth.AuthAdminSaveRequest; @@ -14,6 +16,7 @@ import com.glxp.api.admin.res.auth.AuthAdminRoleResponse; import com.glxp.api.admin.service.auth.AuthAdminService; import com.glxp.api.admin.service.auth.AuthRoleAdminService; import com.glxp.api.admin.service.auth.AuthRoleService; +import com.glxp.api.admin.service.auth.DeptService; import com.glxp.api.admin.service.inventory.InvSubWarehouseService; import com.glxp.api.admin.util.GennerOrderUtils; import com.glxp.api.admin.util.PasswordUtils; @@ -47,6 +50,8 @@ public class AuthAdminController { GennerOrderUtils gennerOrderUtils; @Resource private InvSubWarehouseService invSubWarehouseService; + @Resource + private DeptService deptService; /** * 获取管理员列表 @@ -144,7 +149,16 @@ public class AuthAdminController { if (authAdmin.getPassWord() != null) { authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord())); } + + //设置部门信息 + if (StrUtil.isNotBlank(authAdminSaveRequest.getDept())) { + authAdmin.setDept(authAdminSaveRequest.getDept()); + DeptEntity deptEntity = deptService.findByDeptCode(authAdminSaveRequest.getDept()); + authAdmin.setDeptName(deptEntity.getName()); + } + authAdmin.setLastModifyTime(new Date()); + authAdmin.setId(gennerOrderUtils.getRelId()); boolean b = authAdminService.insertAuthAdmin(authAdmin); authAdmin = authAdminService.findByUserName(authAdmin.getUserName()); @@ -192,6 +206,13 @@ public class AuthAdminController { authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord())); } authAdmin.setLastModifyTime(new Date()); + + if (StrUtil.isNotBlank(authAdminSaveRequest.getDept())) { + authAdmin.setDept(authAdmin.getDept()); + DeptEntity deptEntity = deptService.findByDeptCode(authAdmin.getDept()); + authAdmin.setDeptName(deptEntity.getName()); + } + boolean b = authAdminService.updateAuthAdmin(authAdmin); if (!b) { @@ -220,8 +241,8 @@ public class AuthAdminController { if (authAdminSaveRequest.getId() == null) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数错误！"); } - InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseService.filterGroupInvSubAndcode(authAdminSaveRequest.getLocSubInvCode()); - if(invSubWarehouseEntity!=null){ + InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.filterGroupInvSubAndcode(authAdminSaveRequest.getLocSubInvCode()); + if (invSubWarehouseEntity != null) { authAdminSaveRequest.setLocInvCode(invSubWarehouseEntity.getParentId()); } AuthAdmin authAdmin = new AuthAdmin(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptDao.java index b6c34a88..578de075 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/auth/DeptDao.java @@ -21,4 +21,5 @@ public interface DeptDao { boolean deleteAll(); + DeptEntity selectByCode(String code); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.java index 9df0874b..df01f03d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.java @@ -23,4 +23,9 @@ public class AuthAdminQueryRequest extends ListPageRequest { //用户名 != private String neUserName; + /** + * 部门编码 + */ + private String deptCode; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/DeptService.java b/api-admin/src/main/java/com/glxp/api/admin/service/auth/DeptService.java index 049dbcd7..96b4dedf 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/DeptService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/auth/DeptService.java @@ -20,4 +20,5 @@ public interface DeptService { boolean deleteAll(); + DeptEntity findByDeptCode(String dept); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeptServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeptServiceImpl.java index d21690a9..4985a150 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeptServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/DeptServiceImpl.java @@ -43,4 +43,9 @@ public class DeptServiceImpl implements DeptService { public boolean deleteAll() { return deptDao.deleteAll(); } + + @Override + public DeptEntity findByDeptCode(String deptCode) { + return deptDao.selectByCode(deptCode); + } } diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml index c4ae5e9f..da0ec76c 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml @@ -26,6 +26,9 @@ = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> + + AND dept = #{deptCode} + ORDER BY id DESC diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml index 01554923..9c8905a5 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml @@ -50,4 +50,7 @@ from auth_dept + \ No newline at end of file