修改管理后台接口bug

Pu Zhibing

2025-02-28 398213305237fe9e8a4ee84a2c052ec5f393c4f9

修改管理后台接口bug

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/BannerController.java

@@ -55,7 +55,7 @@
        Integer id = this.getLoginUserInfoSanGeShenBian().getId();
        SystemUser systemUser = systemUserService.getById(id);
        if(systemUser.getAccountLevel() != 1){
            return R.fail("添加失败");
            return R.fail("添加失败，权限不足。");
        }
        banner.setDel(0);
        banner.setCreateTime(LocalDateTime.now());
@@ -71,7 +71,7 @@
        Integer id = this.getLoginUserInfoSanGeShenBian().getId();
        SystemUser systemUser = systemUserService.getById(id);
        if(systemUser.getAccountLevel() != 1){
            return R.fail("编辑失败");
            return R.fail("编辑失败，权限不足。");
        }
        bannerService.updateById(banner);
        return R.ok(banner);
@@ -85,7 +85,7 @@
        Integer id1 = this.getLoginUserInfoSanGeShenBian().getId();
        SystemUser systemUser = systemUserService.getById(id1);
        if(systemUser.getAccountLevel() != 1){
            return R.fail("删除失败");
            return R.fail("删除失败，权限不足。");
        }
        bannerService.update(new UpdateWrapper<Banner>().eq("id", id).set("del", 1));
        return R.ok();

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/DepartmentController.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.sangeshenbian.model.entity.Department;
import com.panzhihua.sangeshenbian.model.entity.SystemUser;
import com.panzhihua.sangeshenbian.service.IDepartmentService;
@@ -14,7 +15,9 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;

/**
@@ -37,21 +40,29 @@
    @ApiOperation(value = "获取单位列表", tags = {"三个身边后台-用户管理"})
    @OperLog(operModul = "三个身边后台",operType = 0, businessType = "获取单位列表")
    public R<List<Department>> list(String name){
        List<Department> list = departmentService.list();
        List<Department> departmentList1 = list.stream().filter(s -> s.getPid() == 0).collect(Collectors.toList());
        for (Department department : departmentList1) {
            List<Department> departmentList2 = list.stream().filter(s -> s.getPid().equals(department.getId())).collect(Collectors.toList());
        List<Department> list4 = departmentService.list(new LambdaQueryWrapper<Department>().like(StringUtils.isNotEmpty(name), Department::getName, name).eq(Department::getTier, 4));
        Set<Integer> collect3 = list4.stream().map(Department::getPid).collect(Collectors.toSet());
        List<Department> list3 = departmentService.list(new LambdaQueryWrapper<Department>().like(StringUtils.isNotEmpty(name), Department::getName, name).eq(Department::getTier, 3)
                .or().in(collect3.size() > 0, Department::getId, collect3));
        Set<Integer> collect2 = list3.stream().map(Department::getPid).collect(Collectors.toSet());
        List<Department> list2 = departmentService.list(new LambdaQueryWrapper<Department>().like(StringUtils.isNotEmpty(name), Department::getName, name).eq(Department::getTier, 2)
                .or().in(collect2.size() > 0, Department::getId, collect2));
        Set<Integer> collect1 = list2.stream().map(Department::getPid).collect(Collectors.toSet());
        List<Department> list1 = departmentService.list(new LambdaQueryWrapper<Department>().like(StringUtils.isNotEmpty(name), Department::getName, name).eq(Department::getTier, 1)
                .or().in(collect1.size() > 0, Department::getId, collect1));
        for (Department department : list1) {
            List<Department> departmentList2 = list2.stream().filter(s -> s.getPid().equals(department.getId())).collect(Collectors.toList());
            for (Department department1 : departmentList2) {
                List<Department> departmentList3 = list.stream().filter(s -> s.getPid().equals(department1.getId())).collect(Collectors.toList());
                List<Department> departmentList3 = list3.stream().filter(s -> s.getPid().equals(department1.getId())).collect(Collectors.toList());
                for (Department department2 : departmentList3) {
                    List<Department> departmentList4 = list.stream().filter(s -> s.getPid().equals(department2.getId())).collect(Collectors.toList());
                    List<Department> departmentList4 = list4.stream().filter(s -> s.getPid().equals(department2.getId())).collect(Collectors.toList());
                    department2.setChild(departmentList4);
                }
                department1.setChild(departmentList3);
            }
            department.setChild(departmentList2);
        }
        return R.ok(departmentList1);
        return R.ok(list1);
    }
    
    

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/SystemPostController.java

@@ -10,6 +10,7 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.time.LocalDateTime;

/**
 * @author zhibing.pu
@@ -28,6 +29,7 @@
    @ApiOperation(value = "添加职位", tags = {"三个身边后台-职位管理"})
    @OperLog(operModul = "三个身边后台",operType = 1,businessType = "添加职位")
    public R add(@RequestBody SystemPost systemPost) {
        systemPost.setCreateTime(LocalDateTime.now());
        systemPostService.save(systemPost);
        return R.ok();
    }

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/SystemUserController.java

@@ -96,15 +96,75 @@
        LoginReturnVO loginReturnVO = reult.getData();
        TokenVo tokenVo = new TokenVo();
        BeanUtils.copyProperties(loginReturnVO, tokenVo);
		
        List<SystemRoleMenu> list = systemRoleMenuService.list(new LambdaQueryWrapper<SystemRoleMenu>().eq(SystemRoleMenu::getSystemRoleId, systemUser.getSystemRoleId()));
        List<Integer> collect = list.stream().map(SystemRoleMenu::getSystemMenuId).collect(Collectors.toList());
        Set<String> collect1 = new HashSet<>();
        if(collect.size() > 0){
            List<SystemMenu> systemMenus = systemMenuService.listByIds(collect);
            LambdaQueryWrapper<SystemMenu> queryWrapper = new LambdaQueryWrapper<SystemMenu>().in(SystemMenu::getId, collect);
            switch (systemUser.getAccountLevel()){
                case 2:
                    queryWrapper.notIn(SystemMenu::getUrl, Arrays.asList("/system_setting/position_management", "/system_setting/position_management/add", "/system_setting/position_management/del",
                            "/system_setting/role_management", "/system_setting/role_management/add", "/system_setting/role_management/edit", "/system_setting/role_management/del",
                            "/work_order_transaction_management/work_order_item_configuration", "/work_order_transaction_management/work_order_item_configuration/save",
                            "/work_order_transaction_management/problem_type_management", "/work_order_transaction_management/problem_type_management/add",
                            "/work_order_transaction_management/problem_type_management/edit", "/work_order_transaction_management/problem_type_management/del", "/work_order_transaction_management/banner_management",
                            "/work_order_transaction_management/banner_management/add", "/work_order_transaction_management/banner_management/edit", "/work_order_transaction_management/banner_management/del"));
                    break;
                case 3:
                    queryWrapper.notIn(SystemMenu::getUrl, Arrays.asList("/system_setting/position_management", "/system_setting/position_management/add", "/system_setting/position_management/del",
                            "/system_setting/role_management", "/system_setting/role_management/add", "/system_setting/role_management/edit", "/system_setting/role_management/del",
                            "/work_order_transaction_management/work_order_item_configuration", "/work_order_transaction_management/work_order_item_configuration/save",
                            "/work_order_transaction_management/problem_type_management", "/work_order_transaction_management/problem_type_management/add",
                            "/work_order_transaction_management/problem_type_management/edit", "/work_order_transaction_management/problem_type_management/del", "/work_order_transaction_management/banner_management",
                            "/work_order_transaction_management/banner_management/add", "/work_order_transaction_management/banner_management/edit", "/work_order_transaction_management/banner_management/del"));
                    break;
                case 4:
                    queryWrapper.notIn(SystemMenu::getUrl, Arrays.asList("/system_setting/position_management", "/system_setting/position_management/add", "/system_setting/position_management/del",
                            "/system_setting/role_management", "/system_setting/role_management/add", "/system_setting/role_management/edit", "/system_setting/role_management/del",
                            "/work_order_transaction_management/work_order_item_configuration", "/work_order_transaction_management/work_order_item_configuration/save",
                            "/work_order_transaction_management/problem_type_management", "/work_order_transaction_management/problem_type_management/add",
                            "/work_order_transaction_management/problem_type_management/edit", "/work_order_transaction_management/problem_type_management/del", "/work_order_transaction_management/banner_management",
                            "/work_order_transaction_management/banner_management/add", "/work_order_transaction_management/banner_management/edit", "/work_order_transaction_management/banner_management/del"));
                    break;
                case 5:
                    queryWrapper.notIn(SystemMenu::getUrl, Arrays.asList("/system_setting/position_management", "/system_setting/position_management/add", "/system_setting/position_management/del",
                            "/system_setting/role_management", "/system_setting/role_management/add", "/system_setting/role_management/edit", "/system_setting/role_management/del",
                            "/system_setting/people_management", "/system_setting/people_management/add", "/system_setting/people_management/edit", "/system_setting/people_management/del",
                            "/system_setting/people_management/freeze", "/system_setting/unit_management", "/system_setting/people_management/detail", "/system_setting/unit_management/add",
                            "/system_setting/unit_management/edit", "/system_setting/unit_management/del", "/work_order_transaction_management/work_order_item_configuration",
                            "/work_order_transaction_management/work_order_item_configuration/save", "/work_order_transaction_management/problem_type_management",
                            "/work_order_transaction_management/problem_type_management/add", "/work_order_transaction_management/problem_type_management/edit",
                            "/work_order_transaction_management/problem_type_management/del", "/work_order_transaction_management/banner_management",
                            "/work_order_transaction_management/banner_management/add", "/work_order_transaction_management/banner_management/edit", "/work_order_transaction_management/banner_management/del"));
                    break;
            }
            List<SystemMenu> systemMenus = systemMenuService.list(queryWrapper);
            collect1 = systemMenus.stream().map(SystemMenu::getUrl).collect(Collectors.toSet());
        }
        tokenVo.setMenu(collect1);
        tokenVo.setName(systemUser.getName());
        tokenVo.setAccountLevel(systemUser.getAccountLevel());
        switch (systemUser.getAccountLevel()){
            case 1:
                tokenVo.setCityCode("510400");
                break;
            case 2:
                tokenVo.setCityCode("510400");
                tokenVo.setDistrictsCode(systemUser.getDistrictsCode());
                break;
            case 3:
                tokenVo.setCityCode("510400");
                tokenVo.setDistrictsCode(systemUser.getDistrictsCode());
                tokenVo.setStreetId(systemUser.getStreetId());
                break;
            case 4:
                tokenVo.setCityCode("510400");
                tokenVo.setDistrictsCode(systemUser.getDistrictsCode());
                tokenVo.setStreetId(systemUser.getStreetId());
                tokenVo.setCommunityId(systemUser.getCommunityId().toString());
                break;
        }
        return R.ok(tokenVo);
    }
    
@@ -127,7 +187,7 @@
    public R<IPage<SystemUserListVo>> list(SystemUserList query){
        Integer id = this.getLoginUserInfoSanGeShenBian().getId();
        SystemUser user = systemUserService.getById(id);
        IPage<SystemUserListVo> list = systemUserService.list(user.getAccountLevel(), query);
        IPage<SystemUserListVo> list = systemUserService.list(user, query);
        return R.ok(list);
    }
    

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/dao/SystemUserMapper.java

@@ -24,7 +24,7 @@
     * @param query
     * @return
     */
    IPage<SystemUserListVo> list(Page page, @Param("accountLevel") Integer accountLevel, @Param("query") SystemUserList query);
    IPage<SystemUserListVo> list(Page page, @Param("user") SystemUser user, @Param("query") SystemUserList query);
    
    
    /**

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/ISystemUserService.java

@@ -22,7 +22,7 @@
     * @param query
     * @return
     */
    IPage<SystemUserListVo> list(Integer accountLevel, SystemUserList query);
    IPage<SystemUserListVo> list(SystemUser user, SystemUserList query);

    /**
     * 根据手机号码查询小程序用户在三个身边的上级角色用户

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/SystemUserServiceImpl.java

@@ -11,6 +11,7 @@
import com.panzhihua.sangeshenbian.warpper.SystemUserListVo;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -28,11 +29,11 @@
     * @return
     */
    @Override
    public IPage<SystemUserListVo> list(Integer accountLevel, SystemUserList query) {
    public IPage<SystemUserListVo> list(SystemUser user, SystemUserList query) {
        Page page = new Page<>();
        page.setCurrent(query.getPageNum());
        page.setSize(query.getPageSize());
        IPage<SystemUserListVo> list = this.baseMapper.list(page, accountLevel, query);
        IPage<SystemUserListVo> list = this.baseMapper.list(page, user, query);
        return list;
    }


 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/MessageNotificationList.java

@@ -14,13 +14,13 @@
    @ApiModelProperty("标题")
    private String title;
    @ApiModelProperty("承办人")
    private String undertaker;
    private String undertakerUser;
    @ApiModelProperty("电话")
    private String phone;
    @ApiModelProperty("所属单位id")
    private Integer departmentId;
    @ApiModelProperty("职位id")
    private Integer positionId;
    private Integer position;
    @ApiModelProperty("页码")
    private Integer pageNum;
    @ApiModelProperty("每页数")

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/TokenVo.java

@@ -18,8 +18,6 @@
    private String token;
    @ApiModelProperty("刷新token有效期长")
    private String refreshToken;
    @ApiModelProperty("communityId")
    private Long communityId;
    @ApiModelProperty("openId")
    private String openId;
    @ApiModelProperty("社区经度")
@@ -30,4 +28,16 @@
    private Set<String> menu;
    @ApiModelProperty("用户名")
    private String name;
    @ApiModelProperty("账号等级")
    private Integer accountLevel;
    @ApiModelProperty("账号等级对应数据id")
    private String accountLevelId;
    @ApiModelProperty("社区ID")
    private String communityId;
    @ApiModelProperty("街道id")
    private String streetId;
    @ApiModelProperty("区县编号")
    private String districtsCode;
    @ApiModelProperty("市编号")
    private String cityCode;
}

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/MessageNotificationMapper.xml

@@ -32,9 +32,9 @@
        <if test="query.title != null and query.title != ''">
            and a.title like concat('%', #{query.title}, '%')
        </if>
        <if test="query.undertaker != null and query.undertaker != ''">
            and (b5.name like concat('%', #{undertaker}, '%') or b4.name like concat('%', #{undertaker}, '%') or b3.name like concat('%', #{undertaker}, '%') or
            b2.region_name like concat('%', #{undertaker}, '%') or b1.region_name like concat('%', #{undertaker}, '%'))
        <if test="query.undertakerUser != null and query.undertakerUser != ''">
            and (b5.name like concat('%', #{query.undertakerUser}, '%') or b4.name like concat('%', #{query.undertakerUser}, '%') or b3.name like concat('%', #{query.undertakerUser}, '%') or
            b2.region_name like concat('%', #{query.undertakerUser}, '%') or b1.region_name like concat('%', #{query.undertakerUser}, '%'))
        </if>
        <if test="query.phone != null and query.phone != ''">
            and a.phone like concat('%', #{query.phone}, '%')
@@ -43,8 +43,8 @@
            and (c.one_department_id = #{query.departmentId} or c.two_department_id = #{query.departmentId} or
                 c.three_department_id = #{query.departmentId} or c.four_department_id = #{query.departmentId})
        </if>
        <if test="query.positionId != null">
            and c.system_post_id = #{query.positionId}
        <if test="query.position != null">
            and c.system_post_id = #{query.position}
        </if>
        order by a.read_status asc, a.create_time desc
    </select>

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/resources/mapper/SystemUserMapper.xml

@@ -23,12 +23,6 @@
        left join sgsb_system_post f on (a.system_post_id = f.id)
        left join sgsb_system_role g on (a.system_role_id = g.id)
        where a.`status` != 3
        <if test="1 != accountLevel and 5 != accountLevel">
            and a.account_level >= #{accountLevel}
        </if>
        <if test="5 == accountLevel">
            and a.id = 0
        </if>
        <if test="null != query.name and '' != query.name">
            and a.name like CONCAT('%', #{query.name}, '%')
        </if>
@@ -41,6 +35,18 @@
        <if test="null != query.systemRoleId">
            and a.system_role_id = #{query.systemRoleId}
        </if>
        <if test="null != user.accountLevel and 2 == user.accountLevel">
            and a.account_level >= #{user.accountLevel} and a.districts_code = #{user.districtsCode}
        </if>
        <if test="null != user.accountLevel and 3 == user.accountLevel">
            and a.account_level >= #{user.accountLevel} and a.street_id = #{user.streetId}
        </if>
        <if test="null != user.accountLevel and 4 == user.accountLevel">
            and a.account_level >= #{user.accountLevel} and a.community_id = #{user.communityId}
        </if>
        <if test="null != user.accountLevel and 5 == user.accountLevel">
            and a.id = 0
        </if>
        <if test="null != query.accountLevel">
            and a.account_level = #{query.accountLevel}
        </if>