From 463c33a84548b4fc3cc585c1c592fc8288c785b3 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Fri, 25 Aug 2023 18:00:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/sysstaffinfo/SysStaffinfoDto.java  |  3 +-
 .../sysstaffinfo/SysStaffinfoService.java     | 40 +++++++++----------
 .../system/sysuser/SysUserMapper.java         |  2 +-
 .../system/sysuser/SysUserMapper.xml          | 15 ++++---
 .../system/sysuser/SysUserService.java        |  8 ++--
 5 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoDto.java
index 7ffa47bf..5e00ee5b 100644
--- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoDto.java
+++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoDto.java
@@ -181,6 +181,5 @@ public class SysStaffinfoDto implements Dto {
     private Date quitDate;
     @ApiModelProperty(value = "离职原因")
     private String quitReason;
-    @ApiModelProperty(value = "微信")
-    private String openId;
+    private Integer userType;
 }
\ No newline at end of file
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 3f33f1fe..7a4d2822 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
@@ -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) {
@@ -474,9 +474,9 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
 //            return rb.setMsg("选择的出生日期和身份证出生日期不符，请重新选择");
 //        }
 //        //查询部门和岗位是否为空
-//        if (dto.getSysStaffOrg() == null) {
-//            return rb.setMsg("员工部门信息不能为空");
-//        }
+        if (dto.getSysStaffOrg() == null) {
+            return rb.setMsg("员工部门信息不能为空");
+        }
 //        if (dto.getSysStaffPost() == null) {
 //            return rb.setMsg("员工岗位信息不能为空");
 //        }
@@ -558,10 +558,10 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         //增加员工的关联的部门信息
         SysStaffOrg sysStaffOrg = new SysStaffOrg();
         SysStaffOrgDto sysStaffOrgDto = dto.getSysStaffOrg();
-//        if (StringUtils.isBlank(sysStaffOrgDto.getOrgName())) {
-//            return rb.setMsg("所在部门不能为空");
-//        }
-        //sysStaffOrgDto.fillEntity(sysStaffOrg);
+        if (StringUtils.isBlank(sysStaffOrgDto.getOrgName())) {
+            return rb.setMsg("所在部门不能为空");
+        }
+        sysStaffOrgDto.fillEntity(sysStaffOrg);
         sysStaffOrg.setOrgSid(sysStaffOrgDto.getOrgSid());
         sysStaffOrg.setStaffSid(sysStaffinfo3.getSid());
         sysStaffOrg.setManageType("3");
@@ -579,7 +579,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         sysUser.setStaffSid(sysStaffinfo3.getSid());
         sysUser.setUserName(dto.getMobile());
         sysUser.setMobile(sysStaffinfo3.getMobile());
-        sysUser.setUserType(1);
+        sysUser.setUserType(dto.getUserType());
         String password = sysStaffinfo3.getMobile().substring(5, 11);
         String md5 = Encodes.md5(password);
         sysUser.setPassword(md5);
@@ -734,7 +734,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
             }
         }
         //更新用户信息
-        sysUserService.updateByStaffSid(dto.getJobNumber(), sysStaffinfo.getMobile(), sid);
+        //sysUserService.updateByStaffSid(dto.getJobNumber(), sysStaffinfo.getMobile(), sid);
         //更新员工的关联的部门信息
         SysStaffOrgDto sysStaffOrgDto = dto.getSysStaffOrg();
         int count = sysStaffOrgService.selectByStaffAndOrg(sysStaffOrgDto.getOrgSidPath(), sid, "2");
@@ -812,14 +812,14 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         }
         //根据员工sid查询员工的信息
         SysStaffinfo sysStaffinfo = fetchBySid(sid);
-//        if (sysStaffinfo == null) {
-//            return rb.setMsg("此员工信息不存在");
-//        }
-//        //查询员工的手机号是否重复
-//        SysStaffinfo sysStaffinfo2 = baseMapper.selectByMobileAndSid(dto.getMobile(), sid);
-//        if (sysStaffinfo2 != null) {
-//            return rb.setMsg("已存在手机号为" + dto.getMobile() + "的员工");
-//        }
+        if (sysStaffinfo == null) {
+            return rb.setMsg("此员工信息不存在");
+        }
+        //查询员工的手机号是否重复
+        SysStaffinfo sysStaffinfo2 = baseMapper.selectByMobileAndSid(dto.getMobile(), sid);
+        if (sysStaffinfo2 != null) {
+            return rb.setMsg("已存在手机号为" + dto.getMobile() + "的员工");
+        }
 //        //查询是否存在该身份证号的员工
 //        SysStaffinfo sysStaffinfo3 = baseMapper.selectByIdNoAndSid(dto.getIdNo(), sid);
 //        if (sysStaffinfo3 != null) {
@@ -827,7 +827,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
 //        }
         //更新用户基础信息
         BeanUtil.copyProperties(dto, sysStaffinfo);
-        sysStaffinfo.setJobNumber(dto.getJobNumber());
+//        sysStaffinfo.setJobNumber(dto.getJobNumber());
         sysStaffinfo.setPinYinName(PinYinUtils.getPinYinName(dto.getName()));
         sysStaffinfo.setFirstPinYinLabel(PinYinUtils.getCharDuoPinYinChar(dto.getName()));
         //是否意外险参保
@@ -896,7 +896,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
 //            }
 //        }
         //更新用户信息
-        sysUserService.updateByStaffSid(dto.getJobNumber(), sysStaffinfo.getMobile(), sid);
+        sysUserService.updateByStaffSid(sysStaffinfo.getMobile(), sid);
         //更新员工的关联的部门信息
         SysStaffOrgDto sysStaffOrgDto = dto.getSysStaffOrg();
 
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.java
index 13c2c66a..db0f06bd 100644
--- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.java
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.java
@@ -133,7 +133,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @param sid       员工sid
      * @return
      */
-    int updateByStaffSid(@Param("jobNumber") String jobNumber, @Param("mobile") String mobile, @Param("sid") String sid);
+    int updateByStaffSid( @Param("mobile") String mobile, @Param("sid") String sid);
 
     /**
      * 根据员工sid更新用户中的员工工号
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.xml b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.xml
index caf6e4d0..9eb97681 100644
--- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.xml
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.xml
@@ -241,8 +241,7 @@
     <!--根据员工sid更新用户表的工号以及手机号-->
     <update id="updateByStaffSid">
         update sys_user
-        set userName = #{jobNumber},
-            mobile   = #{mobile}
+        set mobile   = #{mobile}
         where staffSid = #{sid}
     </update>
     <!--根据员工sid更新员工的员工编号-->
@@ -252,16 +251,22 @@
         where staffSid = #{sid}
     </update>
 
+<!--    <select id="selectByMobile" resultType="com.yxt.supervise.system.sysuser.SysUser">-->
+<!--        select su.*-->
+<!--        from sys_user su-->
+<!--                 left join sys_staffinfo si on si.sid = su.staffSid-->
+<!--        where su.mobile = #{mobile}-->
+<!--          and su.isDelete = 0-->
+<!--          and su.userType = 1-->
+<!--          and si.personTypeKey != '01'-->
+<!--    </select>-->
     <select id="selectByMobile" resultType="com.yxt.supervise.system.sysuser.SysUser">
         select su.*
         from sys_user su
                  left join sys_staffinfo si on si.sid = su.staffSid
         where su.mobile = #{mobile}
           and su.isDelete = 0
-          and su.userType = 1
-          and si.personTypeKey != '01'
     </select>
-
     <update id="updateIsEnable">
         UPDATE sys_user
         SET isEnable = #{isEnable}
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 cec080b6..3579c562 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
@@ -949,10 +949,12 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
      * @param sid       员工sid
      * @return
      */
-    public int updateByStaffSid(String jobNumber, String mobile, String sid) {
-        return baseMapper.updateByStaffSid(jobNumber, mobile, sid);
+//    public int updateByStaffSid(String jobNumber, String mobile, String sid) {
+//        return baseMapper.updateByStaffSid(jobNumber, mobile, sid);
+//    }
+    public int updateByStaffSid(String mobile, String sid) {
+        return baseMapper.updateByStaffSid( mobile, sid);
     }
-
     /**
      * 根据员工sid更新用户的员工编号
      *