修复互检时的质检人问题

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

@@ -240,11 +240,13 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             user.setPassword(null);
             userList.add(user);
         } else if (checkType == 1) {
+            System.out.println(""+deptId+" , "+user.getDepartmentId());
             //当前人员如果不在该计划部门下面，属于外调的，那他的审核人应该是该部门的主要负责人（工长）
             if (!deptId.equals(user.getDepartmentId())) {
                 Department department = departmentMapper.selectById(deptId);
-                Integer superiorId = department.getSuperiorId();
-                User targetUser = userMapper.selectOne(new QueryWrapper<User>().select("id, name, corpwx_userid").eq("id", superiorId));
+                String managerId = department.getManagerId();
+                User targetUser = userMapper.selectOne(new QueryWrapper<User>().select("id, name, corpwx_userid").eq("id", managerId));
+                System.out.println("targetUser:"+targetUser.getName());
                 userList.add(targetUser);
             } else {
                 List<Department> allDeptList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", user.getCompanyId()));

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/workView/fillReport.vue

@@ -13,12 +13,13 @@
           <van-cell v-else title="任务变更通知号" :value="reportForm.task_change_notice_num" />
           <van-cell title="钢印号">
             <template>
-              <div style="float:right;">
+              <div style="float:right;" v-if="reportForm.planSteelStampNumberList.length>0">
                 <van-checkbox-group v-model="reportForm.checkedSteelNum" direction="horizontal">
                   <van-checkbox style="padding:5px;" :name="item" @click="onCheckChange"
                     v-for="(item, index) in reportForm.planSteelStampNumberList" :key="index">{{ item }}</van-checkbox>
                 </van-checkbox-group>
               </div>
+              <div v-else>无</div>
             </template>
           </van-cell>
           <van-cell title="进度(%)">