改bug

src/main/java/fcb/project/manager/base/service/impl/TmAuditServiceImpl.java

@@ -56,6 +56,7 @@ public class TmAuditServiceImpl extends ServiceImpl<TmAuditDao, TmAudit> impleme
         if(StringUtils.isNotBlank(houseId)){
             lambdaQueryWrapper.eq(TmAudit::getVrId , houseId);
         }
+        lambdaQueryWrapper.orderByDesc(TmAudit::getAuditTime);
         return getBaseMapper().selectPage(page , lambdaQueryWrapper);
     }
 

src/main/java/fcb/project/manager/base/utils/DataUtils.java

@@ -237,6 +237,9 @@ public class DataUtils {
         LogoConfig logoConfig = new LogoConfig();
         image = logoConfig.LogoMatrix(image, logoPath);
 
+        if(null == image){
+            return false;
+        }
         File parFile = new File(file.getParent() + File.separator);
         if (!parFile.exists()){
             parFile.mkdirs();

src/main/java/fcb/project/manager/base/utils/LogoConfig.java

@@ -1,5 +1,7 @@
 package fcb.project.manager.base.utils;
 
+import lombok.extern.log4j.Log4j2;
+
 import javax.imageio.ImageIO;
 import java.awt.*;
 import java.awt.geom.RoundRectangle2D;
@@ -7,7 +9,7 @@ import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
-
+@Log4j2
 public class LogoConfig {
 	/**
      * 设置 logo  
@@ -36,8 +38,19 @@ public class LogoConfig {
          if(null == logoPath){
              return null;
          }
-         BufferedImage logo = ImageIO.read(new File(logoPath));
 
+         log.info("二维码源照片路径为:{}" , logoPath);
+         BufferedImage logo = null;
+         try {
+            logo = ImageIO.read(new File(logoPath));
+         }catch (Exception e){
+             log.info("读取二维码源文件出现异常:{}" , e);
+             return null;
+         }
+         if(null == logo){
+             log.info("获取二维码源码照片失败");
+             return null;
+         }
          //开始绘制图片  
          g2.drawImage(logo,matrixWidth/5*2,matrixHeigh/5*2, matrixWidth/5, matrixHeigh/5, null);//绘制       
          BasicStroke stroke = new BasicStroke(5,BasicStroke.CAP_ROUND,BasicStroke.JOIN_ROUND);   

src/main/java/fcb/project/manager/core/controller/AuditController.java

@@ -125,7 +125,7 @@ public class AuditController extends BaseController{
         tmAudit.setAuditRemark(auditRemark);
         tmAudit.setAuditorId(tokenMap.getId());
         tmAudit.setAuditTime(LocalDateTime.now());
-        tmAudit.setAuditorName(tokenMap.getUserName());
+        tmAudit.setAuditorName(tokenMap.getNickName());
         int update = tmAuditService.updateAudit(tmAudit);
         if(update != 1){
            throw new CommonBaseException(ResultCodeEnum.D101 , "更新审核记录失败");
@@ -156,7 +156,7 @@ public class AuditController extends BaseController{
         dbHouse.setAuditId(tmAudit.getId());
         dbHouse.setAuditTime(LocalDateTime.now());
         if(null != tokenMap){
-            dbHouse.setAuditorName(tokenMap.getUserName());
+            dbHouse.setAuditorName(tokenMap.getNickName());
             dbHouse.setAuditorId(tokenMap.getId());
         }
 

src/main/java/fcb/project/manager/core/controller/HouseManagerController.java

@@ -160,7 +160,10 @@ public class HouseManagerController extends BaseController{
             String outPutImageName = System.currentTimeMillis() + ".jpg";
             String outPutImageResultPath = imageLocalPath + outPutImageName;
             try {
-                DataUtils.createQRCode(totalVrUrl ,  outPutImageResultPath , localPath);
+                if(!DataUtils.createQRCode(totalVrUrl ,  outPutImageResultPath , localPath)){
+                    log.info("生成分享二维码失败");
+                    return Result.failure("生成分享二维码失败");
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.info("生成分享二维码出现异常");
@@ -216,7 +219,9 @@ public class HouseManagerController extends BaseController{
         String outPutImageName = System.currentTimeMillis() + ".jpg";
         String outPutImageResultPath = imageLocalPath + outPutImageName;
         try {
-            DataUtils.createQRCode(totalVrUrl ,  outPutImageResultPath , downLoanVideoPath);
+            if(!DataUtils.createQRCode(totalVrUrl ,  outPutImageResultPath , downLoanVideoPath)){
+                return Result.failure("生成分享二维码失败");
+            }
         } catch (Exception e) {
             e.printStackTrace();
             log.info("生成分享二维码出现异常");
@@ -289,7 +294,7 @@ public class HouseManagerController extends BaseController{
         tmHouse.setEstateName(tmEstate.getEstateName());
         if(null != tokenMap){
             tmHouse.setCreateById(tokenMap.getId());
-            tmHouse.setCreateByName(tokenMap.getUserName());
+            tmHouse.setCreateByName(tokenMap.getNickName());
         }
         tmHouse.setBelongCompanyId(tmEstate.getBelongCompanyId());
         tmHouse.setBelongCompanyName(tmEstate.getBelongCompanyName());

src/main/java/fcb/project/manager/core/controller/ProjectController.java

@@ -77,7 +77,7 @@ public class ProjectController extends BaseController {
             tmEstate.setBelongCompanyId(tokenMap.getDepartmentId());
             tmEstate.setBelongCompanyName(tokenMap.getDepartmentName());
             tmEstate.setCreateById(tokenMap.getId());
-            tmEstate.setCreateByName(tokenMap.getUserName());
+            tmEstate.setCreateByName(tokenMap.getNickName());
         }
         if (tmEstateService.insertNew(tmEstate)) {
             return Result.success("新增成功");