【丽水】中医院短信推送->微信推送

陈昶聿

5 天以前 70cedec60679fa1c01c280ed5f364ecc54537790

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -20,12 +20,13 @@
import com.ruoyi.system.service.ISysPostService;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
import com.smartor.mapper.SysUserDeptMapper;
import com.ruoyi.system.mapper.SysUserDeptMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@@ -60,7 +61,11 @@
    private ISysPostService postService;

    @Autowired
    @Qualifier("sysUserDeptSystemMapper")
    private SysUserDeptMapper sysUserDeptMapper;

    @Autowired
    private ISysDeptService sysDeptService;

    @Value("${isAdmin}")
    private List<Long> isAdmin;
@@ -125,7 +130,16 @@
        log.info("--------userId的值为：{}", userId);
        userService.checkUserDataScope(userId);
        AjaxResult ajax = AjaxResult.success();
        List<SysRole> roles = roleService.selectRoleAll();

        LoginUser loginUser = getLoginUser();
        SysUser user = loginUser.getUser();
        log.info("--------user的值为：{}", user);

        SysRole roleVo = new SysRole();
        roleVo.setOrgid(user.getOrgid());
        List<SysRole> roles = roleService.selectRoleList(roleVo);
        log.info("--------roles的值为：{}", roles);

        ajax.put("roles", isAdmin.contains(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
        ajax.put("posts", postService.selectPostAll());
        if (StringUtils.isNotNull(userId)) {
@@ -136,19 +150,19 @@
        }
        List<SysUserDept> sysUserDeptKSs = null;
        List<SysUserDept> sysUserDeptBQs = null;
        List<SysDept> sysDeptKSs = null;
        List<SysDept> sysDeptBQs = null;
        SysUserDept sysUserDept = new SysUserDept();
        sysUserDept.setUserId(userId);
        sysUserDept.setDeptType("1");
        LoginUser loginUser = getLoginUser();
        SysUser user = loginUser.getUser();
        log.info("--------user的值为：{}", user);

        sysUserDept.setOrgid(user.getOrgid());
        sysUserDeptKSs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
        ajax.put("belongDepts", sysUserDeptKSs);
        sysDeptKSs = sysDeptService.selectLeafSysDeptListBySysUserDept(sysUserDept);
        ajax.put("belongDepts", sysDeptKSs);

        sysUserDept.setDeptType("2");
        sysUserDeptBQs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
        ajax.put("belongWards", sysUserDeptBQs);
        sysDeptBQs = sysDeptService.selectLeafSysDeptListBySysUserDept(sysUserDept);
        ajax.put("belongWards", sysDeptBQs);

        return ajax;
    }
@@ -269,6 +283,18 @@
    }

    /**
     * 根据 sys_user.hosp_info（科室）和 sys_user.dept_info（病区）补全 sys_user_dept 数据
     */
    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
    @AddOrgId
    @PostMapping("/repairUserDept")
    public AjaxResult repairUserDept(@RequestBody(required = false) SysUser user) {
        String orgid = user == null ? null : user.getOrgid();
        Long userId = user == null ? null : user.getUserId();
        return success(userService.repairUserDeptByHospAndDeptInfo(orgid, userId));
    }

    /**
     * 获取部门树列表
     */
    //@PreAuthorize("@ss.hasPermi('system:user:list')")