1

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/WeiXinCorpController.java

@@ -729,7 +729,7 @@ public class WeiXinCorpController {
                         int spStatus = detail.getInt("SpStatus");
                         String userId = approver.getString("UserId");
                         Optional<User> first = userList.stream().filter(f -> f.getCorpwxUserid().equals(userId)).findFirst();
-                        if(first.isPresent()){
+                        if(first.isPresent()&&spStatus!=1){
                             //新增操作记录数据
                             ProjectApprovalLog projectApprovalLog=new ProjectApprovalLog();
                             projectApprovalLog.setCreateTime(LocalDateTime.now());
@@ -748,7 +748,7 @@ public class WeiXinCorpController {
                     int spStatus = detail.getInt("SpStatus");
                     String userId = approver.getString("UserId");
                     Optional<User> first = userList.stream().filter(f -> f.getCorpwxUserid().equals(userId)).findFirst();
-                    if(first.isPresent()){
+                    if(first.isPresent()&&spStatus!=1){
                         //新增操作记录数据
                         ProjectApprovalLog projectApprovalLog=new ProjectApprovalLog();
                         projectApprovalLog.setCreateTime(LocalDateTime.now());

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectApprovalServiceImpl.java

@@ -313,6 +313,10 @@ public class ProjectApprovalServiceImpl extends ServiceImpl<ProjectApprovalMappe
                         //跳过第一行标题
                         continue;
                     }
+                    if(!codeCell.equals("项目编号")){
+                        msg.setError("当前导入文件非立项导入模板,请下载指定模板进行导入");
+                        return msg;
+                    }
                     //检查编号是否已经存在
                     if (!StringUtils.isEmpty(code)) {
                         int cnt = projectMapper.selectCount(new QueryWrapper<Project>().eq("project_code", code).eq("company_id", user.getCompanyId()));

fhKeeper/formulahousekeeper/timesheet/src/views/projectApproval/projectApproval.vue

@@ -331,7 +331,7 @@
                         </div>
                         <div class="line"><span>{{'项目经理：'}}</span>
                             <span v-if="user.userNameNeedTranslate != 1">{{projectApprocalDetail.inchargerName}}</span>
-                            <span v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='projectApprocalDetail.inchargerName'></ww-open-data></span>
+                            <span v-if="user.userNameNeedTranslate == 1&&projectApprocalDetail.inchargerName"><ww-open-data type='userName' :openid='projectApprocalDetail.inchargerName'></ww-open-data></span>
                         </div>
                         <div class="line"><span>{{'日报审核人：'}}</span>
                             <span v-for="(par,index) in projectApprocalDetail.projectApprovalAuditorList" :key="par.auditorId">