Merge branch 'system-165' of uskycloud/usky-cloud into master

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysUserController.java

@@ -134,6 +134,17 @@ public class SysUserController extends BaseController
         return toAjax(userService.deleteUserByIds(userIds));
     }
 
+    /**
+     * 删除用户
+     */
+//    @Log(title = "用户管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{userId}/{password}")
+    public ApiResult<Void> remove(@PathVariable Long userId,@PathVariable String password)
+    {
+        String password1 = SecurityUtils.encryptPassword(password);
+        return toAjax(userService.deleteUserByPwd(userId,password1));
+    }
+
     /**
      * 重置密码
      */

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/ISysUserService.java

@@ -205,6 +205,15 @@ public interface ISysUserService extends CrudService<SysUser> {
      */
     public int deleteUserByIds(Long[] userIds);
 
+    /**
+     * 通过用户ID、密码删除用户
+     *
+     * @param userId 用户ID
+     * @param password 用户ID
+     * @return 结果
+     */
+    public int deleteUserByPwd(Long userId,String password);
+
     public LoginUser getUserInfo(String username);
 
     public LoginUser getUserInfoOne(String username,Integer tenantId);

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysUserServiceImpl.java

@@ -80,6 +80,7 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
      */
     @Override
     public List<SysUser> selectAllocatedList(SysUser user) {
+        user.setTenantId(SecurityUtils.getTenantId());
         return userMapper.selectAllocatedList(user);
     }
 
@@ -91,6 +92,7 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
      */
     @Override
     public List<SysUser> selectUnallocatedList(SysUser user) {
+        user.setTenantId(SecurityUtils.getTenantId());
         return userMapper.selectUnallocatedList(user);
     }
 
@@ -459,6 +461,22 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
         return userMapper.deleteUserByIds(userIds);
     }
 
+    @Override
+    @Transactional
+    public int deleteUserByPwd(Long userId,String password) {
+        checkUserAllowed(new SysUser(userId));
+        SysUser user = this.selectUserById(userId);
+        if (user.getPassword().equals(password)){
+            // 删除用户与角色关联
+            userRoleMapper.deleteUserRoleByUserId(userId);
+            // 删除用户与岗位表
+            userPostMapper.deleteUserPostByUserId(userId);
+            return userMapper.deleteUserById(userId);
+        }else {
+            throw new BusinessException("密码错误");
+        }
+    }
+
 
     @Override
     public LoginUser getUserInfo(String username) {
@@ -575,7 +593,7 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
         LoginUser loginUser = SecurityUtils.getLoginUser();
         String userType = null;
         if (loginUser != null && !"".equals(loginUser)) {
-            userType = loginUser.getUserType();
+            userType = loginUser.getSysUser().getUserType();
         }
         String userName = null;
         if ("00".equals(userType)) {

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysUserMapper.xml

@@ -106,6 +106,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	    <if test="userName != null and userName != ''">
 			AND u.user_name like concat('%', #{userName}, '%')
 		</if>
+		<if test="tenantId != null and tenantId != '' and tenantId !=0">
+			AND u.tenant_id = #{tenantId}
+		</if>
 		<if test="phonenumber != null and phonenumber != ''">
 			AND u.phonenumber like concat('%', #{phonenumber}, '%')
 		</if>
@@ -124,6 +127,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	    <if test="userName != null and userName != ''">
 			AND u.user_name like concat('%', #{userName}, '%')
 		</if>
+		<if test="tenantId != null and tenantId != '' and tenantId !=0">
+			AND u.tenant_id = #{tenantId}
+		</if>
 		<if test="phonenumber != null and phonenumber != ''">
 			AND u.phonenumber like concat('%', #{phonenumber}, '%')
 		</if>