From 0b6ba66212aa22dd7f870fca1903f62488adc966 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Mon, 23 Nov 2020 18:08:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flow/service/impl/StaffRoleServiceImpl.java        | 10 ++++++++--
 .../lz/modules/sys/controller/SysLoginController.java  |  8 +-------
 src/main/resources/mapper/flow/StaffRoleMapper.xml     |  3 ---
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java
index b09deed9..c40b9aa8 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java
@@ -399,9 +399,15 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
             staffRoleMenuService.deleteStaffRoleMenuByRoleId(staffRole.getId());
             staffRoleEvaluationGroupService.deleteStaffRoleEvaluationGroupByRoleId(staffRole.getId());
             com.lz.modules.app.utils.BeanUtils.copyProperty(staffRole, roleModel);
-            staffEntity = staffDao.selectStaffById(staffRole.getStaffId());
+            staffEntity = staffDao.selectStaffById(roleModel.getStaffId());
             staffRole.setStaffName(staffEntity.getName());
-
+            //如果当前子管理员修改成主管理员
+            if (RoleEnums.MASTER_PM.getName().equals(roleModel.getDepartmentLevel())) {
+               StaffRole data = staffRoleMapper.selectStaffRolesByStaffIdDepartmentLevelList(roleModel.getStaffId(), Arrays.asList(new String[]{RoleEnums.CHILD_PM.getName()}));
+               if(data !=null){
+                   staffRoleMapper.deleteStaffRoleById(data.getId()); //删除子管理员
+               }
+            }
             staffRoleMapper.updateStaffRoleById(staffRole);
             if (RoleEnums.BOSS.getName().equals(staffRole.getDepartmentLevel()) ||
                     RoleEnums.MASTER_PM.getName().equals(staffRole.getDepartmentLevel())) {
diff --git a/src/main/java/com/lz/modules/sys/controller/SysLoginController.java b/src/main/java/com/lz/modules/sys/controller/SysLoginController.java
index 35003310..53a71492 100644
--- a/src/main/java/com/lz/modules/sys/controller/SysLoginController.java
+++ b/src/main/java/com/lz/modules/sys/controller/SysLoginController.java
@@ -201,8 +201,7 @@ public class SysLoginController extends AbstractController {
             }
         }
         //测试环境将不进行短信验证码，
-        // if (!StringUtil.equals(environment, Constant.INVELOMENT_TYPE_TEST)) {
-        if (false) {
+        if (true) {
             //账号不存在、密码错误
             if (!user.getPassword().equals(new Sha256Hash(form.getPassword(), user.getSalt()).toHex())) {
                 return R.error("密码不正确!");
@@ -226,11 +225,6 @@ public class SysLoginController extends AbstractController {
         return r.put("data",map);
     }
 
-
-
-
-
-
     /**
      * 退出
      */
diff --git a/src/main/resources/mapper/flow/StaffRoleMapper.xml b/src/main/resources/mapper/flow/StaffRoleMapper.xml
index 6d941cab..4c7d3687 100644
--- a/src/main/resources/mapper/flow/StaffRoleMapper.xml
+++ b/src/main/resources/mapper/flow/StaffRoleMapper.xml
@@ -95,9 +95,6 @@
     </update>
 
 
-
-
-
     <select id="selectByStaffId" resultType="com.lz.modules.flow.entity.StaffRole">
         select * from lz_staff_role  where  is_delete = 0 and staff_id = #{staffId} limit 1
     </select>