From f9ec941e4ef0d89dea663b93e127f1da0a539783 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Thu, 24 Aug 2023 18:06:37 +0800
Subject: [PATCH] 8/24

---
 .../system/sysstaffinfo/SysStaffinfoService.java   | 14 +++++++-------
 .../supervise/system/sysuser/SysUserService.java   |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoService.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoService.java
index 4386900e..3f33f1fe 100644
--- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoService.java
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoService.java
@@ -280,7 +280,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
             return rb.setMsg("缺少默认试用期员工角色");
         }
         //员工类型
-        //String personTypeKey = dto.getPersonTypeKey();
+//        String personTypeKey = dto.getPersonTypeKey();
         String jobNumber = "";
         SysStaffinfo sysStaffinfo = baseMapper.selectJobNumber();
         if (sysStaffinfo == null) {
@@ -444,7 +444,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
 //            return rb.setMsg("缺少默认试用期员工角色");
 //        }
         //员工类型
-        //String personTypeKey = dto.getPersonTypeKey();
+        String personTypeKey = dto.getPersonTypeKey();
         String jobNumber = "";
         SysStaffinfo sysStaffinfo = baseMapper.selectJobNumber();
         if (sysStaffinfo == null) {
@@ -455,11 +455,11 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
             jobNumber = addOne(jobNumber);
         }
         //查询员工的手机号是否重复
-//        SysStaffinfo sysStaffinfo1 = baseMapper.selectByMobile(dto.getMobile());
-//        SysUser sysUser1 = sysUserService.selectByMobile(dto.getMobile());
-//        if (sysStaffinfo1 != null || sysUser1 != null) {
-//            return rb.setMsg("已存在手机号为" + dto.getMobile() + "的员工");
-//        }
+        SysStaffinfo sysStaffinfo1 = baseMapper.selectByMobile(dto.getMobile());
+        SysUser sysUser1 = sysUserService.selectByMobile(dto.getMobile());
+        if (sysStaffinfo1 != null || sysUser1 != null) {
+            return rb.setMsg("已存在手机号为" + dto.getMobile() + "的员工");
+        }
         //查询是否存在该身份证号的员工
 //        SysStaffinfo sysStaffinfo2 = baseMapper.selectByIdNo(dto.getIdNo());
 //        if (sysStaffinfo2 != null) {
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java
index 8dfeb404..cec080b6 100644
--- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java
@@ -399,7 +399,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
                             userInfoOneVo.setPNameAndDepartmentNameAndPostName(name + "-" + sysStaffOrgVo.getOrgName());
                         }
                         userInfoOneVo.setOrganizationSid(sysStaffOrgVo.getOrgSid());
-                        userInfoOneVo.setOrganizationName(sysStaffOrgVo.getOrgName());
+                        userInfoOneVo.setOrganizationName(sysOrganizationOne.getName());
                         userInfoOneVo.setOrgNamePath(sysStaffOrg.getOrgNamePath());
                         userInfoOneVo.setOrgSidPath(sysStaffOrg.getOrgSidPath());
                         //根据orgSidPath查询分公司sid=====