后台修改

huimv-receive/src/main/java/com/huimv/receive/common/utils/Print.java

@@ -270,6 +270,11 @@ public class Print {
             } else if (user.getJob() == 5) {
                 userVo.setWorkName("洗消点工作人员");
             }
+            if (user.getGender() == 0) {
+                userVo.setSex("男");
+            } else {
+                userVo.setSex("女");
+            }
             userVo.setWorkLocation(user.getWorkLocation());
             list.add(userVo);
         }

huimv-receive/src/main/java/com/huimv/receive/controller/BaseDeviceController.java

@@ -62,4 +62,9 @@ public class BaseDeviceController {
         return deviceService.listSelect(httpServletRequest, paramsMap);
     }
 
+    @PostMapping("/listCount")
+    public Result listCount(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return deviceService.listCount(httpServletRequest, paramsMap);
+    }
+
 }

huimv-receive/src/main/java/com/huimv/receive/service/impl/BaseDeviceServiceImpl.java

@@ -90,8 +90,10 @@ public class BaseDeviceServiceImpl extends ServiceImpl<BaseDeviceMapper, BaseDev
         }
         QueryWrapper<BaseDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId);
-        queryWrapper.and(i -> i.like(StringUtils.isNotBlank(word), "device_code", word)
-                .or().like(StringUtils.isNotBlank(word), "device_name", word));
+        if (StringUtils.isNotBlank(word)) {
+            queryWrapper.and(i -> i.like("device_code", word)
+                    .or().like( "device_name", word));
+        }
         queryWrapper.eq("work_location_type", locationId);
         Page<BaseDevice> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         return new Result(ResultCode.SUCCESS, deviceMapper.selectPage(page, queryWrapper));