恢复被覆盖代码

guoshilong

2023-04-03 965e985ceb03e53dc884037a653e0a49fef020f9

恢复被覆盖代码

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupController.java

@@ -145,7 +145,7 @@
     */
    @ApiOperation(value = "根据项id查询组id", notes = "根据项id查询组id")
    @GetMapping(value = "/getPatrolGroupByItemId")
    public R getPatrolGroupByItemId(String itemId) {
        return R.data(patrolGroupService.getPatrolGroupByItemId(itemId));
    public R getPatrolGroupByItemId(String itemIds) {
        return R.data(patrolGroupService.getPatrolGroupByItemId(itemIds));
    }
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupMapper.java

@@ -28,5 +28,5 @@
     */
    List<TreeNode> getPatrolGroupItemTree();

    List<PatrolGroup> getPatrolGroupByItemId(String itemId);
    List<PatrolGroup> getPatrolGroupByItemId(@Param("itemIds") String itemIds);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupMapper.xml

@@ -65,6 +65,13 @@
        FROM sm_patrol_group_item spgi where spgi.is_deleted = 0
    </select>
    <select id="getPatrolGroupByItemId" resultType="cn.gistack.sm.patrol.entity.PatrolGroup">

        SELECT distinct b.ID,b.NAME FROM
        (
            SELECT ID,GROUP_ID FROM BLADEX.SM_PATROL_GROUP_ITEM WHERE ID IN
            <foreach collection="itemIds.split(',')" item="item" index="index" open="(" separator="," close=")">
                #{item}
            </foreach>
        ) a ,BLADEX.SM_PATROL_GROUP b
        WHERE b.is_deleted = 0 AND a.group_id = b.id
    </select>
</mapper>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolGroupService.java

@@ -21,5 +21,5 @@
     */
    Object getPatrolGroupTree();

    List<PatrolGroup> getPatrolGroupByItemId(String itemId);
    List<PatrolGroup> getPatrolGroupByItemId(String itemIds);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolGroupServiceImpl.java

@@ -46,7 +46,7 @@
    }

    @Override
    public List<PatrolGroup> getPatrolGroupByItemId(String itemId) {
        return baseMapper.getPatrolGroupByItemId(itemId);
    public List<PatrolGroup> getPatrolGroupByItemId(String itemIds) {
        return baseMapper.getPatrolGroupByItemId(itemIds);
    }
}

 skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/RoleController.java

@@ -168,4 +168,14 @@
        return R.data(list);
    }

    /**
     * 获取所有角色
     */
    @GetMapping("/all")
    @ApiOperation(value = "获取所有角色")
    public R<List<Role>> getAll() {
        List<Role> list = roleService.list();
        return R.data(list);
    }

}