后台企业修改2

admin/src/main/java/com/huimv/farm/damsubsidy/controller/BaseFarmerTypeInfoController.java

@@ -52,8 +52,8 @@ public class BaseFarmerTypeInfoController {
 
     @PostMapping("/listType")
     public Result listType(@RequestBody Map map){
-        String farmerType = (String) map.get("farmerType");
-        String animalType = (String) map.get("animalType");
+        String farmerType =map.get("farmerType").toString();
+        String animalType =map.get("animalType").toString();
         QueryWrapper<BaseFarmerTypeInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(!ObjectUtil.isEmpty(farmerType),"farmer_type",farmerType).eq(!ObjectUtil.isEmpty(animalType),"animal_type",animalType);
         return new Result(ResultCode.SUCCESS,baseFarmerTypeInfoService.page(PageUtils.getPage(map),queryWrapper));

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/SysUserServiceImpl.java

@@ -427,7 +427,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             if (role == null || role.equals("")) {
                 queryWrapper.in("user_type",  1, 4);
             } else {
-                queryWrapper.eq("user_type", type);
+                queryWrapper.eq("user_type", role);
             }
             queryWrapper.eq("accout_type", 0)
                     .between(StringUtils.isNotBlank(date), "create_time", date + " 00:00:00", date + " 23:59:59")
@@ -439,7 +439,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             if (role == null || role.equals("")) {
                 queryWrapper.in("user_type",  1, 4);
             } else {
-                queryWrapper.eq("user_type", type);
+                queryWrapper.eq("user_type", role);
             }
             queryWrapper.ge("accout_type", 1)
                     .between(StringUtils.isNotBlank(date), "create_time", date + " 00:00:00", date + " 23:59:59")