From e6251043b073b8ae8210fa0732ac3060380da638 Mon Sep 17 00:00:00 2001
From: feng93 <498533950@qq.com>
Date: Thu, 25 Mar 2021 21:13:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=9A=84=E5=BF=85=E5=A1=AB=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kernel/system/api/pojo/user/SysUserDTO.java    |  5 +++++
 .../service/impl/SysUserOrgServiceServiceImpl.java | 14 ++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/SysUserDTO.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/SysUserDTO.java
index 2c8204b6d..e81dd07cb 100644
--- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/SysUserDTO.java
+++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/user/SysUserDTO.java
@@ -103,6 +103,11 @@ public class SysUserDTO {
      */
     private Long positionId;
 
+    /**
+     * 职务名称
+     */
+    private String positionName;
+
     /**
      * 状态
      */
diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java
index 24f39f3e2..abab0e643 100644
--- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java
+++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java
@@ -28,11 +28,11 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.stylefeng.roses.kernel.system.api.exception.SystemModularException;
 import cn.stylefeng.roses.kernel.system.api.exception.enums.user.SysUserOrgExceptionEnum;
+import cn.stylefeng.roses.kernel.system.api.pojo.user.SysUserOrgDTO;
+import cn.stylefeng.roses.kernel.system.api.pojo.user.request.UserOrgRequest;
 import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserOrg;
 import cn.stylefeng.roses.kernel.system.modular.user.mapper.SysUserOrgMapper;
 import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserOrgService;
-import cn.stylefeng.roses.kernel.system.api.pojo.user.SysUserOrgDTO;
-import cn.stylefeng.roses.kernel.system.api.pojo.user.request.UserOrgRequest;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
@@ -56,7 +56,7 @@ public class SysUserOrgServiceServiceImpl extends ServiceImpl<SysUserOrgMapper,
         UserOrgRequest userOrgRequest = new UserOrgRequest();
         userOrgRequest.setUserId(userId);
         SysUserOrg sysUserOrg = this.detail(userOrgRequest);
-        if(ObjectUtil.isEmpty(sysUserOrg)){
+        if (ObjectUtil.isEmpty(sysUserOrg)) {
             throw new SystemModularException(SysUserOrgExceptionEnum.EMPLOYEE_MANY_MAIN_NOT_FOUND);
         }
         SysUserOrgDTO sysUserOrgDTO = new SysUserOrgDTO();
@@ -104,16 +104,18 @@ public class SysUserOrgServiceServiceImpl extends ServiceImpl<SysUserOrgMapper,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void edit(Long userId, Long orgId, Long positionId) {
-        // 删除已有
+
+        // 删除已有绑定的组织机构
         this.delByUserId(userId);
-        // 新增
+
+        // 新增组织机构绑定
         this.add(userId, orgId, positionId);
     }
 
 
     @Override
     public SysUserOrg detail(UserOrgRequest userOrgResponse) {
-        return this.getOne( this.createWrapper(userOrgResponse), false);
+        return this.getOne(this.createWrapper(userOrgResponse), false);
     }
 
     @Override