Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair

2024-12-14 15:42:03 +08:00 · 2024-12-14 15:42:03 +08:00 · d92d517650
commit d92d517650
parent b0264f1e2a 1d0d6e7d8a
7 changed files with 27 additions and 25 deletions
--- a/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyPosController.java
+++ b/dl-module-company/src/main/java/cn/iocoder/yudao/module/property/controller/admin/PropertyPosController.java
@ -32,14 +32,12 @@ public class PropertyPosController {

    @PostMapping("/create")
    @Operation(summary = "创建企业管理-资产存放位置")
-    @PreAuthorize("@ss.hasPermission('company:property-pos:create')")
    public CommonResult<String> createPropertyPos(@RequestBody PropertyPosReqVO createReqVO) {
        return success(propertyPosService.createPropertyPos(createReqVO));
    }

    @PutMapping("/update")
    @Operation(summary = "更新企业管理-资产存放位置")
-    @PreAuthorize("@ss.hasPermission('company:property-pos:update')")
    public CommonResult<Boolean> updatePropertyPos(@RequestBody PropertyPosReqVO updateReqVO) {
        propertyPosService.updatePropertyPos(updateReqVO);
        return success(true);
@ -48,7 +46,6 @@ public class PropertyPosController {
    @DeleteMapping("/delete")
    @Operation(summary = "删除企业管理-资产存放位置")
    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('company:property-pos:delete')")
    public CommonResult<Boolean> deletePropertyPos(@RequestParam("id") String id) {
        propertyPosService.deletePropertyPos(id);
        return success(true);
@ -57,7 +54,6 @@ public class PropertyPosController {
    @GetMapping("/get")
    @Operation(summary = "获得企业管理-资产存放位置")
    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('company:property-pos:query')")
    public CommonResult<PropertyPosRespVO> getPropertyPos(@RequestParam("id") String id) {
        PropertyPos propertyPos = propertyPosService.getPropertyPos(id);
        return success(BeanUtils.toBean(propertyPos, PropertyPosRespVO.class));
@ -65,7 +61,6 @@ public class PropertyPosController {

    @GetMapping("/page")
    @Operation(summary = "获得企业管理-资产存放位置分页")
-    @PreAuthorize("@ss.hasPermission('company:property-pos:query')")
    public CommonResult<IPage<?>> getPropertyPosPage(PropertyPosReqVO pageReqVO,
                                                      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
@ -81,7 +76,6 @@ public class PropertyPosController {
    **/
    @GetMapping("/list")
    @Operation(summary = "获得企业管理-资产存放位置列表")
-    @PreAuthorize("@ss.hasPermission('company:property-pos:query')")
    public CommonResult<List<?>> getPropertyPosList() {
        return success(propertyPosService.list());
    }
@ -94,7 +88,6 @@ public class PropertyPosController {
    **/
    @GetMapping("/listByCorpId")
    @Operation(summary = "获得企业管理-资产存放位置列表")
-    @PreAuthorize("@ss.hasPermission('company:property-deal:query')")
    public CommonResult<List<PropertyPos>> getPositionByCorpId(String id){
        return success(propertyPosService.list(new LambdaQueryWrapper<PropertyPos>().eq(PropertyPos::getCorpId, id)));
    }
--- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolSwiperController.java
+++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolSwiperController.java
@ -45,6 +45,12 @@ public class DriveSchoolSwiperController extends BaseController
    @GetMapping("/pclist")
    @PermitAll
    public CommonResult pclist(DriveSchoolSwiper driveSchoolSwiper) {
+        if(driveSchoolSwiper.getPageNum() == null) {
+            driveSchoolSwiper.setPageNum(1);
+        }
+        if(driveSchoolSwiper.getPageSize() == null) {
+            driveSchoolSwiper.setPageSize(100);
+        }
        Page<DriveSchoolSwiper> page = new Page<>(driveSchoolSwiper.getPageNum(), driveSchoolSwiper.getPageSize());
        IPage<DriveSchoolSwiper> driveSchoolSeparateIPage = driveSchoolSwiperService.selectDriveSchoolSwiperPclist(driveSchoolSwiper, page);

--- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolSwiperMapper.java
+++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolSwiperMapper.java
@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
-import org.springframework.data.repository.query.Param;
+import org.apache.ibatis.annotations.Param;

 import java.util.List;

--- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/service/impl/DriveSchoolPayServiceImpl.java
+++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/service/impl/DriveSchoolPayServiceImpl.java
@ -99,9 +99,9 @@ public class DriveSchoolPayServiceImpl implements DriveSchoolPayService
        IPage<DriveSchoolPay> driveSchoolPayIPage = driveSchoolPayMapper.stuList(driveSchoolPay, page);
        List<DriveSchoolPay> driveSchoolPays = driveSchoolPayIPage.getRecords();

-        ArrayList<DriveSchoolPay> collect = driveSchoolPays.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(DriveSchoolPay::getIdentity))), ArrayList::new));
+//        ArrayList<DriveSchoolPay> collect = driveSchoolPays.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(DriveSchoolPay::getIdentity))), ArrayList::new));

-        for (DriveSchoolPay schoolPay : collect) {
+        for (DriveSchoolPay schoolPay : driveSchoolPays) {
            Long userId = schoolPay.getUserId();
            AdminUserRespDTO sysUser = userApi.getUser(userId);
            //SysUser sysUser = sysUserMapper.selectUserById(userId);
@ -110,8 +110,8 @@ public class DriveSchoolPayServiceImpl implements DriveSchoolPayService
            }
        }
        //根据时间倒序排序
-        collect.sort(Comparator.comparing(DriveSchoolPay::getCreateTime).reversed());
-        driveSchoolPayIPage.setRecords(collect);
+        driveSchoolPays.sort(Comparator.comparing(DriveSchoolPay::getCreateTime).reversed());
+        driveSchoolPayIPage.setRecords(driveSchoolPays);
        return driveSchoolPayIPage;
    }

--- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolSwiperMapper.xml
+++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolSwiperMapper.xml
@ -111,23 +111,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        FROM drive_school_swiper
        <where>
            deleted = 0
-            <if test="driveSchoolSwiper != null">
-                <if test="driveSchoolSwiper.swiperName != null and driveSchoolSwiper.swiperName != ''">
-                    AND swiper_name LIKE CONCAT('%', #{driveSchoolSwiper.swiperName}, '%')
+
+                <if test="entity.swiperName != null and entity.swiperName != ''">
+                    AND swiper_name LIKE CONCAT('%', #{entity.swiperName}, '%')
                </if>
-                <if test="driveSchoolSwiper.swiperPicture != null and driveSchoolSwiper.swiperPicture != ''">
-                    AND swiper_picture = #{driveSchoolSwiper.swiperPicture}
+                <if test="entity.swiperPicture != null and entity.swiperPicture != ''">
+                    AND swiper_picture = #{entity.swiperPicture}
                </if>
-                <if test="driveSchoolSwiper.jumpUrl != null and driveSchoolSwiper.jumpUrl != ''">
-                    AND jump_url = #{driveSchoolSwiper.jumpUrl}
+                <if test="entity.jumpUrl != null and entity.jumpUrl != ''">
+                    AND jump_url = #{entity.jumpUrl}
                </if>
-                <if test="driveSchoolSwiper.deptId != null">
-                    AND dept_id = #{driveSchoolSwiper.deptId}
+                <if test="entity.deptId != null">
+                    AND dept_id = #{entity.deptId}
                </if>
-                <if test="driveSchoolSwiper.listOrder != null">
-                    AND list_order = #{driveSchoolSwiper.listOrder}
+                <if test="entity.listOrder != null">
+                    AND list_order = #{entity.listOrder}
                </if>
-            </if>
+

        </where>
        ORDER BY list_order ASC
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
@ -117,7 +117,7 @@ public class AuthController {
        if (loginBody.getTypes().equals("3") && !roleNames.contains("教练")){
            return error(new ErrorCode(2_002_000_005, "当前登录用户未分配教练角色"));
        }
-        if (loginBody.getTypes().equals("2") && !roleNames.contains("驾校管理员")){
+        if (loginBody.getTypes().equals("2") && !roleNames.contains("驾校业务管理员")){
            return error(new ErrorCode(2_002_000_005, "当前登录用户未分配驾校管理员角色"));
        }

--- a/yudao-server/src/main/resources/application.yaml
+++ b/yudao-server/src/main/resources/application.yaml
@ -303,6 +303,9 @@ yudao:
      - /app-api/** #小程序端接口，不区分租户
      - /repair/tickets/print/**
      - /admin-api/repair/tickets/print/**
+      - /admin-api/jx/auth/**
+      - /admin-api/jx/**
+      - /admin-api/jx/auth/getAppInfo
    ignore-tables:
      - system_tenant
      - system_tenant_package