去掉企业内部应用对手机号的获取，去掉一些日志

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

@@ -3452,7 +3452,7 @@ public class WeiXinCorpController {
                                 //跳过非激活状态的员工
                                 if (userInfoOb.getInteger("status") != 1) continue;
                                 String userName = String.valueOf(userInfoOb.get("name"));
-                                String phone = String.valueOf(userInfoOb.get("phone"));
+//                                String phone = String.valueOf(userInfoOb.get("phone"));
                                 String openUserid = userInfoOb.getString("open_userid");
                                 List<Integer> departments = (List<Integer>) userInfoOb.get("department");
                                 Integer deptId = departments.get(0);
@@ -3475,7 +3475,7 @@ public class WeiXinCorpController {
                                     .setName(userName)
                                     .setRoleName(role.getRolename())
                                     .setRoleId(role.getId())
-                                    .setPhone(phone)
+//                                    .setPhone(phone)
                                     .setCorpwxRealUserid(corpWxuserid)
                                     .setColor(ColorUtil.randomColor())
                                     .setPassword(MD5Util.getPassword("000000"))

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

@@ -328,13 +328,6 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
             HttpHeaders headers = new HttpHeaders();
             ResponseEntity<byte[]> entity = restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(headers), byte[].class);
             byte[] body = entity.getBody();
-            HttpHeaders respHeader = entity.getHeaders();
-            System.out.println("================开始处理文件==========body size=" + body.length);
-            System.out.println(respHeader.getContentType());
-            System.out.println(respHeader.getContentLength());
-            System.out.println(respHeader.getContentDisposition().getName());
-            ContentDisposition contentDisposition = respHeader.getContentDisposition();
-            System.out.println("文件名==" + contentDisposition.getFilename());
             //写入文件
             String fileName = mediaId + ".jpg";
             FileOutputStream fileOutputStream = new FileOutputStream(new File(path + fileName));
@@ -652,16 +645,7 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
                     UserCorpwxTime userCorpwxTime=new UserCorpwxTime();
                     userCorpwxTime.setCorpwxUserid((String) objects[i]);
                     userCorpwxTime.setCompanyId(corpInfo.getCompanyId());
-                    for (Integer integer : upList) {
-                        if(objects[i].equals("woy9TkCAAArkpTq76GOJYsbYGgzk1g1w")){
-                            System.out.println("上班"+DateTimeUtil.getTimeFromSeconds(integer));
-                        }
-                    }
-                    for (Integer integer : downList) {
-                        if(objects[i].equals("woy9TkCAAArkpTq76GOJYsbYGgzk1g1w")){
-                            System.out.println("下班"+DateTimeUtil.getTimeFromSeconds(integer));
-                        }
-                    }
+
                     System.out.println(upList);
                     System.out.println(downList);
                     if(upList.isEmpty()||downList.isEmpty()){
@@ -685,7 +669,11 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
                     userCorpwxTime.setWeekDayTxt(DateTimeUtil.getWeekDayTxt(userCorpwxTime.getWeekDay()));
                     BigDecimal bigDecimal=new BigDecimal(Duration.between(LocalTime.parse(minTime,df).plusHours(8),LocalTime.parse(maxTime,df).plusHours(8)).toMinutes());
                     bigDecimal=bigDecimal.divide(BigDecimal.valueOf(60),0,BigDecimal.ROUND_HALF_UP).subtract(new BigDecimal(restTime));
-                    userCorpwxTime.setWorkHours(bigDecimal.doubleValue());
+                    double time = bigDecimal.doubleValue();
+                    if (time < 0) {
+                        time = 0;
+                    }
+                    userCorpwxTime.setWorkHours(time);
                     System.out.println(userCorpwxTime);
                     UserCorpwxTime item;
                     if(userId!=null){

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -356,7 +356,7 @@
                         <!--批量填报和批量代填不显示考勤记录-->
                         <span v-if="!isBatch && (user.timeType.syncDingding==1 || user.timeType.syncCorpwxTime==1)&&!workForm.time" >{{$t('other.noAttendanceRecord')}}</span>
                         <el-button type="default" style="margin-left:5px;" size="mini" :loading="syncTimeLoading" 
-                        v-if="!isBatch && user.timeType.syncCorpwxTime==1 && (workForm.createDate == today || !workForm.time || workForm.time.workHours == 0)" icon="el-icon-refresh" 
+                        v-if="!isBatch && user.timeType.syncCorpwxTime==1 && (workForm.createDate == today || !workForm.time || workForm.time.workHours <= 0)" icon="el-icon-refresh" 
                                 @click="refreshWXCardTime(workForm.createDate)"></el-button>
                     </el-form-item>
                     <!-- 000000 -->

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -19,7 +19,7 @@
                     </div>
                 </template>
                 <template #right-icon>
-                    <van-button icon="replay" native-type="button" type="default" size="mini" style="height:0.6rem;padding:0 0.16667rem;" :loading="cardRefLoading" loading-size="0.26667rem" @click.stop.native="cardtimeRefresh(form.createDate)" v-if="user.timeType.syncCorpwxTime==1 && (form.createDate == today || !report.time || report.time.workHours == 0) && (user.timeType.syncDingding == 1 || user.timeType.syncCorpwxTime == 1)"></van-button>
+                    <van-button icon="replay" native-type="button" type="default" size="mini" style="height:0.6rem;padding:0 0.16667rem;" :loading="cardRefLoading" loading-size="0.26667rem" @click.stop.native="cardtimeRefresh(form.createDate)" v-if="user.timeType.syncCorpwxTime==1 && (form.createDate == today || !report.time || report.time.workHours <= 0) && (user.timeType.syncDingding == 1 || user.timeType.syncCorpwxTime == 1)"></van-button>
                 </template>
             </van-cell>
                 <!-- <div v-if="report.time" class="attendanceRecord">