完善

platform-dao/src/main/java/com/platform/dao/util/MessageTemplateUtil.java

@@ -3,6 +3,7 @@ package com.platform.dao.util;
 import com.platform.common.exception.BusinessException;
 import com.platform.common.util.StringUtils;
 import com.platform.dao.dto.repair.RepairApplicationFormDTO;
+import com.platform.dao.entity.sb.SbInfo;
 import com.platform.dao.vo.sb.SbInfoVO;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
@@ -135,7 +136,7 @@ public class MessageTemplateUtil {
      * @param vo
      * @return
      */
-    public static String getFreemarkerHtmlContent(String url, RepairApplicationFormDTO model, SbInfoVO vo){
+    public static String getFreemarkerHtmlContent(String url, RepairApplicationFormDTO model, SbInfo vo){
         // 首先配置 FreeMarker 模版位置
         Configuration configuration = new Configuration(Configuration.VERSION_2_3_0);
         ClassLoader loader = MessageTemplateUtil.class.getClassLoader();

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -196,14 +196,19 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         int count = mapper.selectCountByExample(weekend);
         // 查询对应的维修人，保存维修单
         String sbId = model.getSbId();
-        SbInfoVO sb = sbInfoService.getById(sbId);
-        if (sb== null) {
+        SbInfo sb = sbInfoService.getModelById(sbId);
+        if (sb == null) {
             throw new BusinessException("设备不存在，无法报修");
         }
         if(StringUtils.isBlank(model.getActualUser())){
-            UserInfo userInfo = SecurityUtils.getUserInfo();
-            model.setUserId(userInfo.getUserId());
-            model.setActualUser(userInfo.getRealName());
+            SysUser sysUser = sysUserService.getModelById(sb.getSaveUser());
+            if(sysUser != null){
+                model.setUserId(sysUser.getUserId());
+                model.setActualUser(sysUser.getRealName());
+            }else{
+                model.setUserId("1");
+                model.setActualUser("superadmin");
+            }
         }else{
             SysUser sysUser = new SysUser();
             sysUser.setRealName(model.getActualUser());

platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -1219,7 +1219,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
                 });
             }
         }
-        vo.setCurrentAuditUserName(activitiBusinessService.getCurrentAuditUserName(vo.getProcessInstanceId()));
+        // vo.setCurrentAuditUserName(activitiBusinessService.getCurrentAuditUserName(vo.getProcessInstanceId()));
         return vo;
     }
 

platform-service/src/main/java/com/platform/service/wechat/util/WeChatMessageUtil.java

@@ -5,6 +5,7 @@ import com.platform.common.util.DateUtils;
 import com.platform.common.util.SpringContextHolder;
 import com.platform.common.util.StringUtils;
 import com.platform.dao.dto.repair.RepairApplicationFormDTO;
+import com.platform.dao.entity.sb.SbInfo;
 import com.platform.dao.enums.SysConfigEnum;
 import com.platform.dao.vo.sb.SbInfoVO;
 import com.platform.service.event.WechatEvent;
@@ -77,7 +78,7 @@ public class WeChatMessageUtil {
      * @param model
      * @param vo
      */
-    public static void repairMessage(String openId, String url, RepairApplicationFormDTO model, SbInfoVO vo) {
+    public static void repairMessage(String openId, String url, RepairApplicationFormDTO model, SbInfo vo) {
         try {
             if(StringUtils.isBlank(url)){
                 url = repair_url;