1

huimv-receive/pom.xml

@@ -148,8 +148,11 @@
             <artifactId>thumbnailator</artifactId>
             <version>0.4.8</version>
         </dependency>
-
-
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>5.2.2.RELEASE</version>
+        </dependency>
 
 
     </dependencies>

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

@@ -2,18 +2,21 @@ package com.huimv.receive.common.utils;
 
 
 import net.coobird.thumbnailator.Thumbnails;
+
+import org.apache.tomcat.util.http.fileupload.FileItem;
+import org.apache.tomcat.util.http.fileupload.disk.DiskFileItem;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
 import sun.misc.BASE64Decoder;
 import sun.misc.BASE64Encoder;
 
-import javax.imageio.ImageIO;
-import javax.imageio.ImageReader;
+
+import javax.imageio.*;
 import javax.imageio.stream.ImageInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import javax.imageio.stream.ImageOutputStream;
+import java.awt.image.BufferedImage;
+import java.io.*;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -35,30 +38,30 @@ public class ImageSizeUtil {
      * @param params
      * @return
      */
-    public static int getImageLengthOfSide(MultipartFile params){
-        int lengthSize = 0;
-        Map<String, Integer> result = new HashMap<>();
-        long beginTime = new Date().getTime();
-        // 获取图片格式
-        String suffixName = getSuffixNameInfo(params);
-        try {
-            Iterator<ImageReader> readers = ImageIO.getImageReadersByFormatName(suffixName);
-            ImageReader reader = (ImageReader) readers.next();
-            ImageInputStream iis = ImageIO.createImageInputStream(params.getInputStream());
-            reader.setInput(iis, true);
-            result.put("width",reader.getWidth(0));
-            result.put("height",reader.getHeight(0));
-            if(reader.getWidth(0) > reader.getHeight(0)){
-                lengthSize = reader.getWidth(0);
-            }else{
-                lengthSize = reader.getHeight(0);
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        return lengthSize;
-    }
+//    public static int getImageLengthOfSide(MultipartFile params){
+//        int lengthSize = 0;
+//        Map<String, Integer> result = new HashMap<>();
+//        long beginTime = new Date().getTime();
+//        // 获取图片格式
+//        String suffixName = getSuffixNameInfo(params);
+//        try {
+//            Iterator<ImageReader> readers = ImageIO.getImageReadersByFormatName(suffixName);
+//            ImageReader reader = (ImageReader) readers.next();
+//            ImageInputStream iis = ImageIO.createImageInputStream(params.getInputStream());
+//            reader.setInput(iis, true);
+//            result.put("width",reader.getWidth(0));
+//            result.put("height",reader.getHeight(0));
+//            if(reader.getWidth(0) > reader.getHeight(0)){
+//                lengthSize = reader.getWidth(0);
+//            }else{
+//                lengthSize = reader.getHeight(0);
+//            }
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        }
+//
+//        return lengthSize;
+//    }
 
     /**
      * 获取图片格式
@@ -170,16 +173,16 @@ public class ImageSizeUtil {
      * 压缩图片
      * @return
      */
-    public static MultipartFile byte2Base64StringFun(MultipartFile fileImg){
+    public static MultipartFile byte2Base64StringFun(MultipartFile fileImg) throws IOException {
         MultipartFile result = fileImg;
         // 获取图片最长边
-        int imageLengthSize = ImageSizeUtil.getImageLengthOfSide(fileImg);
-        Long swd = fileImg.getSize();
+//        int imageLengthSize = ImageSizeUtil.getImageLengthOfSide(fileImg);
+//        Long swd = fileImg.getSize();
             BASE64Encoder encoder = new BASE64Encoder();
             String imgData1 = null;
             try {
                 InputStream inputStream = fileImg.getInputStream();
-                byte[] imgData = ImageSizeUtil.compressPicForScale(ToolsUtil.getByteArray(inputStream),200);
+                byte[] imgData = ImageSizeUtil.compressPicForScale(ToolsUtil.getByteArray(inputStream),100);
                 imgData1 = "data:"+fileImg.getContentType()+";base64,"+encoder.encode(imgData);
                 MultipartFile def = ImageSizeUtil.base64ToMultipart(imgData1);
                 result = def;
@@ -191,6 +194,55 @@ public class ImageSizeUtil {
 
 
 
+    /**
+     * 将MultipartFile中的图片转换为JPG格式，保持原始尺寸并返回转换后的图片大小
+     * @param multipartFile 原始图片文件
+     * @return 转换后的JPG格式图片的大小（字节）
+     * @throws IOException 处理图片过程中可能出现的IO异常
+     */
+    public static long convertToJpgAndGetSize(MultipartFile multipartFile) throws IOException {
+        // 读取原始图片
+        BufferedImage originalImage = ImageIO.read(multipartFile.getInputStream());
+
+        // 获取原始图片的宽度和高度
+        int width = originalImage.getWidth();
+        int height = originalImage.getHeight();
+
+        // 创建一个新的BufferedImage，类型为RGB（JPG不支持透明通道）
+        BufferedImage jpgImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+
+        // 将原始图片绘制到新的BufferedImage中，确保尺寸不变
+        jpgImage.createGraphics().drawImage(originalImage, 0, 0, width, height, null);
+
+        // 创建字节数组输出流
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
+
+        try {
+            // 获取JPG格式的ImageWriter
+            Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("jpg");
+            if (!writers.hasNext()) {
+                throw new IllegalStateException("No JPG image writer found");
+            }
+            ImageWriter writer = writers.next();
+            writer.setOutput(ios);
+
+            // 设置JPG编码参数，质量为1.0（最高质量）
+            ImageWriteParam param = writer.getDefaultWriteParam();
+            param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
+            param.setCompressionQuality(1.0f);
+
+            // 写入图片
+            writer.write(null, new IIOImage(jpgImage, null, null), param);
+
+            // 返回图片大小（字节）
+            return baos.size();
+        } finally {
+            // 关闭资源
+            ios.close();
+            baos.close();
+        }
+    }
 
 
 }

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

@@ -171,7 +171,7 @@ public class UploadImage {
             //先转成jpg格式来压缩,然后在通过OSS来修改成源文件本来的后缀格式
             ImageIO.write(bufferedImage,"jpg",bos);
             byte[] bytes = bos.toByteArray();
-            String imgname = UUID.randomUUID() + "." + filenameExtension;
+            String imgname = UUID.randomUUID() + "." + "jpg";
             sshSftp(bytes, path, imgname);
             return url+ path + "/" + imgname;
         } catch (Exception e) {

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

@@ -21,6 +21,8 @@ import com.huimv.receive.timer.test.TestWeight;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.http.ResponseEntity;
+
+import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
@@ -28,9 +30,12 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.awt.*;
 import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -56,15 +61,15 @@ public class LoginController {
     private BillGateMapper billGateMapper;
 
     @PostMapping("/saveDiBang")
-    public String logout(@RequestBody Map<String, List<TestWeight>> map ) {
+    public String logout(@RequestBody Map<String, List<TestWeight>> map) {
         List<TestWeight> dibang = map.get("dibang");
         for (TestWeight testWeight : dibang) {
             System.out.println(testWeight);
 
-            BillGate billGate = billGateMapper.selectOne(new QueryWrapper<BillGate>().eq("stdno",testWeight.getFStdNo()));
+            BillGate billGate = billGateMapper.selectOne(new QueryWrapper<BillGate>().eq("stdno", testWeight.getFStdNo()));
             if (ObjectUtil.isEmpty(billGate)) {
                 List<BillGate> billGate1 = billGateMapper.selectList(new QueryWrapper<BillGate>().eq("car_num", testWeight.getFCarNo())
-                        .between("check_date", testWeight.getBeginTime(), testWeight.getEndTime()).eq("check_location",testWeight.getDeviceCode()));
+                        .between("check_date", testWeight.getBeginTime(), testWeight.getEndTime()).eq("check_location", testWeight.getDeviceCode()));
                 if (ObjectUtil.isNotEmpty(billGate1)) {
                     billGate = billGate1.get(0);
                     billGate.setGross(testWeight.getGross() + "");
@@ -85,13 +90,12 @@ public class LoginController {
     }
 
     @PostMapping("/test")
-    public Result test(@RequestParam(name = "picture1")MultipartFile picture1 ) throws IOException {
+    public Result test(@RequestParam(name = "picture1") MultipartFile picture1) throws IOException {
         uploadImage.getVideoCom(picture1);
         return iLoginService.logout();
     }
 
 
-
     @Autowired
     private RedisTemplate<String, String> redisTemplate;
 
@@ -171,33 +175,33 @@ public class LoginController {
         String type = map.get("type");
         String remoteHost = req.getRemoteHost();
         // 未对密码加密
-            SysAccountMultilevel accountEntity = accountMultilevelService.getById(userId);
+        SysAccountMultilevel accountEntity = accountMultilevelService.getById(userId);
 
-            accountEntity.setType(Integer.parseInt(type));
-            accountMultilevelService.updateById(accountEntity);
-            accountEntity.setJobName(baseJobService.getById(type).getJobName());
+        accountEntity.setType(Integer.parseInt(type));
+        accountMultilevelService.updateById(accountEntity);
+        accountEntity.setJobName(baseJobService.getById(type).getJobName());
 
-            Integer id = accountEntity.getId();
-            IpTools.getRemoteHost(req);
-            AccessToken accessToken = new AccessToken();
-            accessToken.setCreated(new Date());
-            accessToken.setAccountName(accountEntity.getAccount());
-            accessToken.setFarmId(accountEntity.getFarmIds());
-            String token = TokenSign.sign(accountEntity.getUserName(), id, accountEntity.getFarmIds(), accountEntity.getWorkLocationType()+"", accountEntity.getType());
-            accessToken.setToken(token);
+        Integer id = accountEntity.getId();
+        IpTools.getRemoteHost(req);
+        AccessToken accessToken = new AccessToken();
+        accessToken.setCreated(new Date());
+        accessToken.setAccountName(accountEntity.getAccount());
+        accessToken.setFarmId(accountEntity.getFarmIds());
+        String token = TokenSign.sign(accountEntity.getUserName(), id, accountEntity.getFarmIds(), accountEntity.getWorkLocationType() + "", accountEntity.getType());
+        accessToken.setToken(token);
 
-            accessToken.setId(id);
-            accessToken.setLoginIp(remoteHost);
-            accessToken.setType(accountEntity.getType());
-            Integer lastFarmId = accountEntity.getLastFarmId();
-            if (ObjectUtil.isEmpty(lastFarmId)) {
-                lastFarmId = Integer.parseInt(accountEntity.getFarmIds().split(",")[0]);
-            }
-            accessToken.setLastFarmId(lastFarmId);
-            accessToken.setUserName(accountEntity.getUserName());
-            accessToken.setSysAccountMultilevel(accountEntity);
+        accessToken.setId(id);
+        accessToken.setLoginIp(remoteHost);
+        accessToken.setType(accountEntity.getType());
+        Integer lastFarmId = accountEntity.getLastFarmId();
+        if (ObjectUtil.isEmpty(lastFarmId)) {
+            lastFarmId = Integer.parseInt(accountEntity.getFarmIds().split(",")[0]);
+        }
+        accessToken.setLastFarmId(lastFarmId);
+        accessToken.setUserName(accountEntity.getUserName());
+        accessToken.setSysAccountMultilevel(accountEntity);
 
-            return new Result(ResultCode.SUCCESS, accessToken);
+        return new Result(ResultCode.SUCCESS, accessToken);
     }
 
     //测试-token
@@ -236,11 +240,11 @@ public class LoginController {
             accessToken.setAccountName(accountName);
             accessToken.setFarmId(accountEntity.getFarmIds());
             Integer lastFarmId1 = accountEntity.getLastFarmId();
-            if (ObjectUtil.isEmpty(lastFarmId1)){
+            if (ObjectUtil.isEmpty(lastFarmId1)) {
                 lastFarmId1 = accountEntity.getFarmId();
             }
 
-            String token = TokenSign.sign(accountName, id,lastFarmId1.toString() , accountEntity.getWorkLocationType(),accountEntity.getType());
+            String token = TokenSign.sign(accountName, id, lastFarmId1.toString(), accountEntity.getWorkLocationType(), accountEntity.getType());
             accessToken.setToken(token);
 
             accessToken.setId(id);
@@ -273,7 +277,7 @@ public class LoginController {
             accessToken.setFarmId(data.getFarmIds());
             accessToken.setType(data.getType());
             accessToken.setId(data.getId());
-            String token = TokenSign.sign(data.getUserName(), data.getId(), data.getLastFarmId().toString(), data.getWorkLocationType()+"", data.getType());
+            String token = TokenSign.sign(data.getUserName(), data.getId(), data.getLastFarmId().toString(), data.getWorkLocationType() + "", data.getType());
             accessToken.setToken(token);
             Integer lastFarmId = data.getLastFarmId();
             if (ObjectUtil.isEmpty(lastFarmId)) {
@@ -352,7 +356,7 @@ public class LoginController {
     }*/
 
     @GetMapping("/logoutWeChat")
-    public Result logoutWeChat(HttpServletRequest req, @RequestParam String jsCode,@RequestParam String phone) {
+    public Result logoutWeChat(HttpServletRequest req, @RequestParam String jsCode, @RequestParam String phone) {
         String remoteHost = req.getRemoteHost();
         Map<String, Object> paramsMap = new HashMap<>();
         paramsMap.put("appid", "wx221c66f51278c05f");
@@ -398,7 +402,7 @@ public class LoginController {
                     accessToken.setFarmId(data1.getFarmIds());
                     accessToken.setType(7);
                     accessToken.setId(data1.getId());
-                    String token = TokenSign.sign(data1.getUserName(), data1.getId(), data1.getLastFarmId().toString(), data1.getWorkLocationType()+"", 7);
+                    String token = TokenSign.sign(data1.getUserName(), data1.getId(), data1.getLastFarmId().toString(), data1.getWorkLocationType() + "", 7);
                     accessToken.setToken(token);
                     Integer lastFarmId = data1.getLastFarmId();
                     if (ObjectUtil.isEmpty(lastFarmId)) {
@@ -427,7 +431,7 @@ public class LoginController {
                 accessToken.setFarmId(data.getFarmIds());
                 accessToken.setType(7);
                 accessToken.setId(data.getId());
-                String token = TokenSign.sign(data.getUserName(), data.getId(), data.getLastFarmId().toString(), data.getWorkLocationType()+"", 7);
+                String token = TokenSign.sign(data.getUserName(), data.getId(), data.getLastFarmId().toString(), data.getWorkLocationType() + "", 7);
                 accessToken.setToken(token);
                 Integer lastFarmId = data.getLastFarmId();
                 if (ObjectUtil.isEmpty(lastFarmId)) {
@@ -436,7 +440,7 @@ public class LoginController {
                 accessToken.setLastFarmId(lastFarmId);
                 accessToken.setLoginIp(remoteHost);
                 return new Result(ResultCode.SUCCESS, accessToken);
-            }else {
+            } else {
                 return new Result(ResultCode.UNAUTHENTICATED, "输入的手机号已被他人进行过微信登录！");
             }
         }
@@ -444,15 +448,15 @@ public class LoginController {
 
     @GetMapping("/logWeChatGetPhone")
     public Result logWeChatGetPhone(HttpServletRequest req, @RequestParam String jsCode) {
-        String access_token ="";
-        if ( !redisTemplate.hasKey("weChatGetPhone") || redisTemplate.getExpire("weChatGetPhone") ==null || redisTemplate.getExpire("weChatGetPhone") <=0){
+        String access_token = "";
+        if (!redisTemplate.hasKey("weChatGetPhone") || redisTemplate.getExpire("weChatGetPhone") == null || redisTemplate.getExpire("weChatGetPhone") <= 0) {
             String result = HttpUtil.get("https://api.weixin.qq.com/cgi-bin/token?appid=wx221c66f51278c05f&secret=b553cf2e2de240ac93db6b6c8d135f55&grant_type=client_credential");
             System.out.println(result);
             JSONObject jsonObject = JSON.parseObject(result);
-            access_token =  (String) jsonObject.get("access_token");
-            redisTemplate.opsForValue().set("weChatGetPhone",access_token);
-            redisTemplate.expire("weChatGetPhone",7200,TimeUnit.SECONDS);
-        }else {
+            access_token = (String) jsonObject.get("access_token");
+            redisTemplate.opsForValue().set("weChatGetPhone", access_token);
+            redisTemplate.expire("weChatGetPhone", 7200, TimeUnit.SECONDS);
+        } else {
             access_token = redisTemplate.opsForValue().get("weChatGetPhone");
         }
         RestTemplate restTemplate = new RestTemplate();
@@ -461,11 +465,12 @@ public class LoginController {
         ResponseEntity<String> stringResponseEntity = restTemplate.postForEntity("https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=" + access_token, paramsMap, String.class);
 
         System.out.println(stringResponseEntity.getBody());
-        return new Result(ResultCode.SUCCESS,JSON.parseObject(stringResponseEntity.getBody()));
+        return new Result(ResultCode.SUCCESS, JSON.parseObject(stringResponseEntity.getBody()));
     }
+
     @PostMapping("/register2")
-    public String register2( @RequestParam(value = "video", required = false) MultipartFile video) throws IOException {
-        return   uploadImage.getVideoCom(video);
+    public String register2(@RequestParam(value = "video", required = false) MultipartFile video) throws IOException {
+        return uploadImage.getVideoCom(video);
     }
 
     @PostMapping("/register")
@@ -479,12 +484,12 @@ public class LoginController {
         String remoteHost = req.getRemoteHost();
 
         MultipartFile multipartFile = ImageSizeUtil.byte2Base64StringFun(imgUrl);
-        boolean result = uploadImage.checkFileSize(multipartFile.getSize(), 200, "K");
+        boolean result = uploadImage.checkFileSize(multipartFile.getSize(), 100, "K");
         if (!result) {
             return new Result(10001, "上传个人照片太大，请重新上传", false);
         }
         QueryWrapper<SysAccountMultilevel> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("type",7).and(i->i.eq("phone", phone).or().eq("papers_code", papersCode));
+        queryWrapper.eq("type", 7).and(i -> i.eq("phone", phone).or().eq("papers_code", papersCode));
         if (ObjectUtil.isNotEmpty(accountMultilevelService.getOne(queryWrapper))) {
             return new Result(10001, "该手机号或身份证号已被使用！", false);
         }
@@ -524,7 +529,7 @@ public class LoginController {
         accessToken.setFarmId(sysAccountMultilevel.getFarmIds());
         accessToken.setType(sysAccountMultilevel.getType());
         accessToken.setId(sysAccountMultilevel.getId());
-        String token = TokenSign.sign(sysAccountMultilevel.getUserName(), sysAccountMultilevel.getId(), sysAccountMultilevel.getLastFarmId().toString(), sysAccountMultilevel.getWorkLocationType()+"", sysAccountMultilevel.getType());
+        String token = TokenSign.sign(sysAccountMultilevel.getUserName(), sysAccountMultilevel.getId(), sysAccountMultilevel.getLastFarmId().toString(), sysAccountMultilevel.getWorkLocationType() + "", sysAccountMultilevel.getType());
         accessToken.setToken(token);
         Integer lastFarmId = sysAccountMultilevel.getLastFarmId();
         if (ObjectUtil.isEmpty(lastFarmId)) {
@@ -534,4 +539,46 @@ public class LoginController {
         accessToken.setLoginIp(remoteHost);
         return new Result(ResultCode.SUCCESS, accessToken);
     }
+
+    @PostMapping("/test1")
+    public Result test1() throws IOException {
+        List<SysAccountMultilevel> list = accountMultilevelService.list();
+        for (SysAccountMultilevel sysAccountMultilevel : list) {
+            String imgUrl = sysAccountMultilevel.getImgUrl();
+            if (null == imgUrl || "".equals(imgUrl)) {}else{
+                URL url = new URL(imgUrl);
+                // 将在线图片地址转换为URL对象
+// 打开URL连接
+                HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+// 获取输入流
+                InputStream inputStream = connection.getInputStream();
+// 读取输入流中的数据，并保存到字节数组中
+                ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+                byte[] buffer = new byte[1024];
+                int bytesRead;
+                while ((bytesRead = inputStream.read(buffer)) != -1) {
+                    byteArrayOutputStream.write(buffer, 0, bytesRead);
+                }
+// 将字节数组转换为字节数组输入流
+                ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
+// 创建MultipartFile对象
+                MultipartFile file = new MockMultipartFile("file", "filename.jpg", "image/jpg", byteArrayInputStream);
+                MultipartFile multipartFile = ImageSizeUtil.byte2Base64StringFun(file);
+                boolean result = uploadImage.checkFileSize(multipartFile.getSize(), 100, "K");
+                if (!result) {
+                    return new Result(10001, "上传个人照片太大，请重新上传", false);
+                }
+                String imageCom = uploadImage.getImageCom(multipartFile);
+                if (imageCom.equals("上传失败")) {
+                    return new Result(10001, "图片上传失败！", false);
+                }
+                sysAccountMultilevel.setImgUrl(imageCom);
+                accountMultilevelService.updateById(sysAccountMultilevel);
+            }
+
+        }
+        return new Result(ResultCode.SUCCESS);
+    }
+
+
 }

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

@@ -988,11 +988,16 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         }
         if ("1".equals(type)) {
             QueryWrapper<BillAccessDoor> queryWrapper = new QueryWrapper<>();
-            if (277==id) {
-                queryWrapper.orderByDesc("check_date");
-            } else {
-                queryWrapper.in("farm_id", farmId,1,2).orderByDesc("check_date");
+            if (null != id) {
+                if (277==id) {
+                    queryWrapper.orderByDesc("check_date");
+                } else {
+                    queryWrapper.in("farm_id", farmId,1,2).orderByDesc("check_date");
+                }
+            }else {
+                queryWrapper.eq("farm_id", farmId).orderByDesc("check_date");
             }
+
             if ("1".equals(status)) {
                 queryWrapper.eq("bill_status", 1);
             } else if ("2".equals(status)) {
@@ -1002,11 +1007,16 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             return new Result(ResultCode.SUCCESS, doorMapper.selectPage(page, queryWrapper));
         } else {
             QueryWrapper<BillGate> queryWrapper = new QueryWrapper<>();
-            if (277==id) {
-                queryWrapper.orderByDesc("check_date");
-            } else {
-                queryWrapper.in("farm_id", Integer.parseInt(farmId),1,2).orderByDesc("check_date");
+            if (null != id) {
+                if (277==id) {
+                    queryWrapper.orderByDesc("check_date");
+                } else {
+                    queryWrapper.in("farm_id", Integer.parseInt(farmId),1,2).orderByDesc("check_date");
+                }
+            }else {
+                queryWrapper.eq("farm_id", farmId).orderByDesc("check_date");
             }
+
             if ("1".equals(status)) {
                 queryWrapper.eq("bill_status", 1);
             } else if ("2".equals(status)) {

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

@@ -147,7 +147,7 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
         SysAccountMultilevel sysAccountMultilevel = accountMultilevelMapper.selectById(TokenSign.getMemberIdByJwtToken(httpServletRequest));
         if (ObjectUtil.isNotEmpty(img)) {
             MultipartFile multipartFile = ImageSizeUtil.byte2Base64StringFun(img);
-            boolean result = uploadImage.checkFileSize(multipartFile.getSize(), 200, "K");
+            boolean result = uploadImage.checkFileSize(multipartFile.getSize(), 100, "K");
             if (!result) {
                 return new Result(10001, "上传个人照片太大，请重新上传", false);
             }