1、增加轮播图维护 2、修复队伍接口报错

zengh

2022-09-29 adcff04c70567f4b1e74ec2c8dcecbb5164f94ec

1、增加轮播图维护
2、修复队伍接口报错

 src/main/java/org/springblade/common/config/BladeConfiguration.java

@@ -108,6 +108,7 @@
        secureRegistry.excludePathPatterns("/trar/**");
        secureRegistry.excludePathPatterns("/integral/**");
        secureRegistry.excludePathPatterns("/organ/**");
        secureRegistry.excludePathPatterns("/rotation/**");
        secureRegistry.excludePathPatterns("/policy/**");
        secureRegistry.excludePathPatterns("/vote/vote/**");
        secureRegistry.excludePathPatterns("/useroption/useroption/**");

 src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml

@@ -56,7 +56,7 @@
            LIKE CONCAT ('%', #{article.keyword},'%')
        </if>
        and iswords = "1"
        order by create_time desc
        order by id desc
    </select>

    <!--查询资讯分页列表信息-->
@@ -97,7 +97,7 @@
            AND publish = 1
        </if>
        and iswords = "0"
        order by create_time desc
        order by id desc
    </select>

    <!--查询资讯分页列表信息-->
@@ -161,7 +161,7 @@
            AND publish = 1
        </if>
        and iswords = "0"
        order by create_time desc
        order by id desc
    </select>

    <!--查询资讯分页列表信息-->
@@ -226,7 +226,7 @@
            AND publish = 1
        </if>
        and iswords = "0"
        order by create_time desc
        order by id desc
    </select>

    <update id="upcomment">
@@ -261,6 +261,6 @@
            AND publish = 1
        </if>
        and iswords = "0" and type!=1
        order by create_time desc
        order by id desc
    </select>
</mapper>

 src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java

@@ -125,8 +125,8 @@
    @GetMapping("/lazy-team")
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "懒加载树形结构", notes = "树形结构")
    public R<List<JurisdictionVO>> lazyTeam(String tenantId, Long parentId, BladeUser bladeUser) {
        List<JurisdictionVO> tree = jurisdictionService.lazyTeam(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), parentId);
    public R<List<JurisdictionVO>> lazyTeam() {
        List<JurisdictionVO> tree = jurisdictionService.lazyTeam();
        return R.data(tree);
    }


 src/main/java/org/springblade/modules/jurisdiction/mapper/JurisdictionMapper.java

@@ -56,7 +56,7 @@
     * @return
     */
    List<JurisdictionVO> lazyTree(String tenantId, Long parentId);
    List<JurisdictionVO> lazyTeam(String tenantId, Long parentId);
    List<JurisdictionVO> lazyTeam();

    /**
     * 懒加载获取树形节点

 src/main/java/org/springblade/modules/jurisdiction/mapper/JurisdictionMapper.xml

@@ -114,9 +114,6 @@
        SELECT id,police as parent_id,name as dept_name,is_deleted FROM sys_team
        )  dept
        WHERE dept.is_deleted = 0
        <if test="param1!=null and param1!=''">
            and dept.tenant_id = #{param1}
        </if>
    </select>

    <select id="lazyTrees" resultMap="treeNodeResultMap">

 src/main/java/org/springblade/modules/jurisdiction/service/JurisdictionService.java

@@ -59,11 +59,9 @@
    /**
     * 懒加载树形结构
     *
     * @param tenantId
     * @param parentId
     * @return
     */
    List<JurisdictionVO> lazyTeam(String tenantId, Long parentId);
    List<JurisdictionVO> lazyTeam();
    List<Map> listJur();

    /**

 src/main/java/org/springblade/modules/jurisdiction/service/impl/JurisdictionServiceImpl.java

@@ -76,11 +76,8 @@
        return ForestNodeMerger.merge(baseMapper.lazyTree(tenantId, parentId));
    }
    @Override
    public List<JurisdictionVO> lazyTeam(String tenantId, Long parentId) {
        if (AuthUtil.isAdministrator()) {
            tenantId = StringPool.EMPTY;
        }
        return ForestNodeMerger.merge(baseMapper.lazyTeam(tenantId, parentId));
    public List<JurisdictionVO> lazyTeam() {
        return ForestNodeMerger.merge(baseMapper.lazyTeam());
    }

    @Override

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -502,11 +502,11 @@
        User user = JSON.parseObject(JSON.toJSONString(userMap.get("user")), User.class);

        //数据脱敏处理
        user.setAccount(user.getRealName().substring(0,1)+user.getCardid().substring(user.getCardid().length()-4));
        user.setCardid(DesensitizedUtil.desensitizedIdNumber(user.getCardid()));
        user.setPhone(DesensitizedUtil.desensitizedPhoneNumber(user.getPhone()));
        user.setName(DesensitizedUtil.desensitizedName(user.getName()));
        user.setRealName(DesensitizedUtil.desensitizedName(user.getRealName()));
//        user.setAccount(user.getRealName().substring(0,1)+user.getCardid().substring(user.getCardid().length()-4));
//        user.setCardid(DesensitizedUtil.desensitizedIdNumber(user.getCardid()));
//        user.setPhone(DesensitizedUtil.desensitizedPhoneNumber(user.getPhone()));
//        user.setName(DesensitizedUtil.desensitizedName(user.getName()));
//        user.setRealName(DesensitizedUtil.desensitizedName(user.getRealName()));


        Integer userCount = userService.selectCount(user.getAccount());