用户管理数据权限bug修改

mitao

2025-02-14 275f1256a0c9229d6d102401a869152239c201ca

用户管理数据权限bug修改

 medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwApplicationController.java

@@ -7,6 +7,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
@@ -28,6 +29,7 @@
@RestController
@Api(tags = {"入驻申请"})
@RequiredArgsConstructor
@Slf4j
@RequestMapping("/applet/mwApplication")
public class AppMwApplicationController {
    private final MwApplicationService mwApplicationService;
@@ -37,6 +39,7 @@
    @ApiOperation("提交入驻申请")
    @PostMapping("/set")
    public R pageList(@Valid @RequestBody MwApplication mwApplication) {
        log.error("提交入驻申请入参：{}", mwApplication);
        String string = redisCache.getCacheObject(mwApplication.getPhone()).toString();
        if (!mwApplication.getCode().equals(string)){
            return R.fail("验证码错误，请重试");

 medicalWaste-system/src/main/java/com/sinata/system/mapper/SysUserMapper.java

@@ -138,5 +138,5 @@
     * @param userName
     * @return
     */
    Page<SysUserVO> pageList(Page<SysUserVO> sysUserVOPage, @Param("nickName") String nickName, @Param("roleId") Long roleId, @Param("userName") String userName, @Param("treeCode") String treeCode);
    Page<SysUserVO> pageList(Page<SysUserVO> sysUserVOPage, @Param("nickName") String nickName, @Param("roleId") Long roleId, @Param("userName") String userName, @Param("treeCode") String treeCode, @Param("roleIdList") List<Long> roleIdList);
}

 medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysUserServiceImpl.java

@@ -41,6 +41,7 @@

import javax.validation.Validator;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -576,7 +577,13 @@
        if (StringUtils.isBlank(treeCode)) {
            return PageDTO.empty(0L, 0L);
        }
        Page<SysUserVO> page = baseMapper.pageList(new Page<>(query.getPageCurr(), query.getPageSize()), query.getNickName(), query.getRoleId(), query.getUserName(), treeCode);
        Long userId = SecurityUtils.getUserId();
        SysRole sysRole = roleMapper.selectRoleByUserId(userId);
        if (Objects.isNull(sysRole)) {
            throw new ServiceException("当前用户没有角色");
        }
        List<Long> roleIdList = Arrays.stream(sysRole.getManageRoleIdStr().split(",")).map(Long::parseLong).collect(Collectors.toList());
        Page<SysUserVO> page = baseMapper.pageList(new Page<>(query.getPageCurr(), query.getPageSize()), query.getNickName(), query.getRoleId(), query.getUserName(), treeCode, roleIdList);
        return PageDTO.of(page);
    }


 medicalWaste-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -196,7 +196,9 @@
                        r.status              AS status,
                        r.del_flag            AS delFlag,
                        r.create_time         AS createTime,
                        r.create_by           AS createBy
                        r.create_by          AS createBy,
                        r.manage_role_id_str AS manageRoleIdStr,
                        r.applet_flag        AS appletFlag
        from sys_role r
                 left join sys_user_role ur on ur.role_id = r.role_id
        where ur.user_id = #{userId}

 medicalWaste-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -177,6 +177,12 @@
            <if test="treeCode != null and treeCode != ''">
                AND sd.TREE_CODE LIKE CONCAT(#{treeCode},'%')
            </if>
            <if test="roleIdList != null and roleIdList.size() !=0">
                AND sur.ROLE_ID IN
                <foreach collection="roleIdList" item="item" open="(" separator="," close=")">
                    #{item}
                </foreach>
            </if>
        </where>
        ORDER BY su.CREATE_TIME DESC
    </select>