zhangnaisong
2023-07-20 1b5007fd66cb2c56e7b54b793cdd3f29785f5c04
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyUserController.java
@@ -1,6 +1,7 @@
package com.ruoyi.sy.controller;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -45,10 +46,13 @@
     */
    @PreAuthorize("@ss.hasPermi('sy:syUser:list')")
    @GetMapping("/list")
    @ApiOperation("查询三一车辆挂接用户")
    public TableDataInfo list(ArdSyUser ardSyUser)
    {
        startPage();
        List<ArdSyUser> list = ardSyUserService.selectArdSyUserList(ardSyUser);
        /*List<ArdSyUser> list = ardSyUserService.selectArdSyUserList(ardSyUser);
        return getDataTable(list);*/
        List<Map<String,Object>> list = ardSyUserService.selectArdSyUserListWithSysUser(ardSyUser);
        return getDataTable(list);
    }
@@ -127,13 +131,13 @@
    /**
     * 查询未挂接三一车辆的4.0用户
     */
    /*@PreAuthorize("@ss.hasPermi('sy:syUser:getSysUserNoSY')")
    @PreAuthorize("@ss.hasPermi('sy:syUser:getSysUserNoSY')")
    @GetMapping("/getSysUserNoSY")
    @ApiOperation("查询未挂接三一车辆的4.0用户")
    public AjaxResult getSysUserNoSY()
    {
        //startPage();
        startPage();
        List<SysUser> list = ardSyUserService.getSysUserNoSY();
        return success(list);
    }*/
    }
}