修改bug

src/main/java/com/care/bms/controller/DeviceController.java

@@ -53,6 +53,7 @@ public class DeviceController {
             @ApiImplicitParam(paramType = "query", name = "houseAddr", value = "地址"),
             @ApiImplicitParam(paramType = "query", name = "chambId", value = "管家ID"),
             @ApiImplicitParam(paramType = "query", name = "memberId", value = "用户ID"),
+            @ApiImplicitParam(paramType = "query", name = "orgId", value = "机构ID"),
     })
     public PageResult<List<DeviceVO>> listDevice(HttpServletRequest request, @RequestHeader(value = "token") String token,
                                                  @RequestParam(value = "stationId", required = false) Long stationId,
@@ -63,10 +64,11 @@ public class DeviceController {
                                                  @RequestParam(value = "houseAddr", required = false) String houseAddr,
                                                  @RequestParam(value = "chambId", required = false) Long chambId,
                                                  @RequestParam(value = "memberId", required = false) Long memberId,
+                                                 @RequestParam(value = "orgId", required = false) Long orgId,
                                                  PageReqVO pageReqVo){
         try {
             UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<DeviceVO> pageResponse = this.deviceService.listDevice(stationId,devCode,activeStatus,chambName,status,houseAddr,chambId,memberId,loginUser ,pageReqVo);
+            IPage<DeviceVO> pageResponse = this.deviceService.listDevice(stationId,devCode,activeStatus,chambName,status,houseAddr,chambId,memberId,orgId,loginUser ,pageReqVo);
             return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
         }catch (BDException e) {
             log.error("设备列表查询-分页列表出现异常",e);

src/main/java/com/care/bms/controller/StationAccountController.java

@@ -47,14 +47,16 @@ public class StationAccountController {
     @GetMapping("/listStationAccount")
     @ApiOperation(value = "服务站账号列表分页  --四期新增")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "stationName", value = "服务站名称")
+            @ApiImplicitParam(paramType = "query", name = "stationName", value = "服务站名称"),
+            @ApiImplicitParam(paramType = "query", name = "orgId", value = "机构ID")
     })
     public PageResult<List<SysUserVO>> listStationAccount(HttpServletRequest request, @RequestHeader(value = "token") String token,
                                                           @RequestParam(value = "stationName", required = false) String stationName,
+                                                          @RequestParam(value = "orgId", required = false) Long orgId,
                                                           PageReqVO pageReqVo){
         try {
             UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            IPage<SysUserVO> pageResponse = this.bmsSysUserService.listStationAccount(stationName,loginUser ,pageReqVo);
+            IPage<SysUserVO> pageResponse = this.bmsSysUserService.listStationAccount(stationName,orgId,loginUser ,pageReqVo);
             return PageResult.success(pageResponse.getRecords(),pageResponse.getCurrent(),pageResponse.getSize(),pageResponse.getTotal());
         }catch (BDException e) {
             log.error("服务站账号列表查询-分页列表出现异常",e);

src/main/java/com/care/bms/service/BmsSysUserService.java

@@ -363,7 +363,7 @@ public class BmsSysUserService{
      * @param stationName
      * @return
      */
-    public IPage<SysUserVO> listStationAccount(String stationName, UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
+    public IPage<SysUserVO> listStationAccount(String stationName,Long orgId, UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
 
         QueryWrapper<CareStation> queryWrapper0 = new QueryWrapper<>();
         queryWrapper0.lambda().like(StrUtil.isNotEmpty(stationName),CareStation::getName,stationName);
@@ -378,6 +378,7 @@ public class BmsSysUserService{
         IPage<CareSysUser> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
         QueryWrapper<CareSysUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda() .in(CollUtil.isNotEmpty(stationIds),CareSysUser::getStationId,stationIds)
+                .eq(orgId != null,CareSysUser::getOrgId,orgId)
                 .eq(CareSysUser::getOrgId,loginUser.getOrgId())
                 .eq(CareSysUser::getRole,UserRoleEnum.STATION.getValue())
                 .orderByAsc(CareSysUser::getName);

src/main/java/com/care/bms/service/DeviceService.java

@@ -363,8 +363,8 @@ public class DeviceService {
      * @param pageReqVo
      * @return
      */
-    public IPage<DeviceVO> listDevice(Long stationId, String  devCode, String activeStatus, String chambName,String status,String houseAddr,Long chambId,Long memberId,UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
-        return this.careDeviceService.queryList(pageReqVo,stationId,devCode,activeStatus,chambName,status,houseAddr,chambId,memberId,loginUser);
+    public IPage<DeviceVO> listDevice(Long stationId, String  devCode, String activeStatus, String chambName,String status,String houseAddr,Long chambId,Long memberId,Long orgId,UserLogindConvertVO loginUser, PageReqVO pageReqVo) {
+        return this.careDeviceService.queryList(pageReqVo,stationId,devCode,activeStatus,chambName,status,houseAddr,chambId,memberId,orgId,loginUser);
     }
     /**
      * 列表查询没有站点的

src/main/java/com/care/common/mapper/CareDeviceMapper.java

@@ -27,6 +27,7 @@ public interface CareDeviceMapper extends BaseMapper<CareDevice> {
                               @Param("houseAddr") String houseAddr,
                               @Param("chambId") Long chambId,
                               @Param("memberId") Long memberId,
+                              @Param("orgId") Long orgId,
 							  @Param("userOrgId") Long userOrgId,
                               @Param("userStationId") Long userStationId
                               );

src/main/java/com/care/common/service/CareDeviceService.java

@@ -25,7 +25,7 @@ public interface CareDeviceService extends IService<CareDevice> {
      */
     List<DeviceVO> queryListByMemberId(Long memberId);
 
-    IPage<DeviceVO> queryList(PageReqVO pageReqVo, Long stationId, String devCode, String activeStatus,String chambName, String status,String houseAddr, Long chambId,Long memberId,UserLogindConvertVO loginUser);
+    IPage<DeviceVO> queryList(PageReqVO pageReqVo, Long stationId, String devCode, String activeStatus,String chambName, String status,String houseAddr, Long chambId,Long memberId,Long orgId,UserLogindConvertVO loginUser);
     IPage<DeviceVO> listDeviceNonStation(PageReqVO pageReqVo,UserLogindConvertVO loginUser);
     Map<String,String> get3dUrl(Long deviceId);
 

src/main/java/com/care/common/service/impl/CareDeviceServiceImpl.java

@@ -76,9 +76,9 @@ public class CareDeviceServiceImpl extends ServiceImpl<CareDeviceMapper, CareDev
     }
 
     @Override
-    public IPage<DeviceVO> queryList(PageReqVO pageReqVo, Long stationId, String devCode, String activeStatus,String chambName, String status, String houseAddr,Long chambId, Long memberId,UserLogindConvertVO loginUser) {
+    public IPage<DeviceVO> queryList(PageReqVO pageReqVo, Long stationId, String devCode, String activeStatus,String chambName, String status, String houseAddr,Long chambId, Long memberId,Long orgId,UserLogindConvertVO loginUser) {
         IPage<DeviceVO> page = new Page<>(pageReqVo.getCurrent(), pageReqVo.getPageSize());
-        IPage<DeviceVO> pageRes = this.baseMapper.queryList(page, stationId,devCode,activeStatus,chambName,status,houseAddr,chambId,memberId,loginUser.getOrgId(),loginUser.getStationId());
+        IPage<DeviceVO> pageRes = this.baseMapper.queryList(page, stationId,devCode,activeStatus,chambName,status,houseAddr,chambId,memberId,orgId,loginUser.getOrgId(),loginUser.getStationId());
         if(CollUtil.isNotEmpty(pageRes.getRecords())){
             pageRes.getRecords().forEach(item -> {
                 item.setStatusName(DeviceStatusEnum.getCodeToName(item.getStatus()));

src/main/resources/mybatis/CareDeviceMapper.xml

@@ -52,6 +52,9 @@
             <if test="memberId != null">
                 AND ceoc.member_id = #{memberId}
             </if>
+            <if test="orgId != null">
+                AND ceoc.org_id = #{orgId}
+            </if>
         </where>
         order by ceoc.dev_code asc
     </select>