suntianwu преди 3 години
родител
ревизия
0169161add
променени са 2 файла, в които са добавени 3 реда и са изтрити 2 реда
  1. 1 1
      src/main/java/com/care/bms/controller/SysUserController.java
  2. 2 1
      src/main/java/com/care/bms/service/BmsSysUserService.java

+ 1 - 1
src/main/java/com/care/bms/controller/SysUserController.java

@@ -45,7 +45,7 @@ public class SysUserController {
      */
     @GetMapping("/listKeeper4Select")
     @ApiOperation(value = "登陆人所属机构、服务站下的管家下拉列表")
-    public Result<List<SysUserVO>> listNotHandle(HttpServletRequest request, @RequestHeader(value = "token") String token,
+    public Result<List<SysUserVO>> listKeeper4Select(HttpServletRequest request, @RequestHeader(value = "token") String token,
                                                  @RequestParam(name = "stationId", required = false) Long stationId){
         try {
             UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);

+ 2 - 1
src/main/java/com/care/bms/service/BmsSysUserService.java

@@ -120,7 +120,8 @@ public class BmsSysUserService{
     public List<SysUserVO> queryKeeperListByStationId(Long orgId, Long stationId){
         List<SysUserVO> datas = new ArrayList<>();
         QueryWrapper<CareSysUser>  userQueryWrapper = new QueryWrapper<>();
-        userQueryWrapper.lambda().eq(orgId != null,CareSysUser::getOrgId,orgId).eq(CareSysUser::getStationId,stationId)
+        userQueryWrapper.lambda().eq(orgId != null,CareSysUser::getOrgId,orgId)
+                .eq(stationId !=null,CareSysUser::getStationId,stationId)
                 .eq(CareSysUser::getRole, UserRoleEnum.CHANMB.getValue())
                 .orderByAsc(CareSysUser::getName);
         List<CareSysUser> users = this.careSysUserService.list(userQueryWrapper);