Merge remote-tracking branch 'origin/master'

aijinhui

2024-02-23 0abccf5e570dce53a802bca4ce25118dd900692c

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -18,6 +18,7 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.system.mapper.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,11 +37,6 @@
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.SysUserPost;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.mapper.SysPostMapper;
import com.ruoyi.system.mapper.SysRoleMapper;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.mapper.SysUserPostMapper;
import com.ruoyi.system.mapper.SysUserRoleMapper;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService;

@@ -77,6 +73,9 @@
    private RedisCache redisCache;
    @Resource
    private ArdAlarmTypeConfigMapper ardAlarmTypeConfigMapper;

    @Resource
    private SysDeptMapper sysDeptMapper;

    /**
     * 项目启动时，初始化参数到缓存
@@ -640,4 +639,12 @@
        queryWrapper.in("dept_id",deptList);
        return userMapper.selectList(queryWrapper);
    }

    @Override
    public List<SysUser> userByDept(Long deptId) {
        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("dept_id",deptId).eq("del_flag","0").eq("app_user_type","1");
        return userMapper.selectList(queryWrapper);
    }

}