Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

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

@@ -242,6 +242,31 @@ public class DingDingController {
                                 }
                             }
                         }
+                    } else if ("SYNC_HTTP_PUSH_MEDIUM".equals(eventType)) {
+                        JSONArray bizData = eventJson.getJSONArray("bizData");
+                        if (bizData.size() > 0) {
+                            //优先处理suite_ticket推送
+                            for (int i = 0; i < bizData.size(); i++) {
+                                JSONObject bizItem = bizData.getJSONObject(i);
+                                int bizType = bizItem.getInteger("biz_type");
+                                if (13 == bizType) {
+                                    JSONObject actionBizData = bizItem.getJSONObject("biz_data");
+                                    String syncAction = actionBizData.getString("syncAction");
+                                    if ("user_leave_org".equals(syncAction)) {
+                                        //员工离职
+                                        String corpId = bizItem.getString("corp_id");
+                                        String unionId = actionBizData.getString("unionid");
+                                        Integer companyId = companyDingdingMapper.selectById(corpId).getCompanyId();
+                                        User user = userMapper.selectOne(new QueryWrapper<User>().eq("company_id", companyId).eq("dingding_unionid", unionId));
+                                        if (user != null && user.getIsActive() == 1) {
+                                            user.setIsActive(0);
+                                            user.setInactiveDate(LocalDate.now());
+                                            userMapper.updateById(user);
+                                        }
+                                    }
+                                }
+                            }
+                        }
                     }
                 }
             }

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

@@ -348,7 +348,7 @@
                         <span>{{projectList.filter(p=>p.id == domain.projectId)[0].projectDesc}}</span>
                     </el-form-item>
                     <!--如果设置了工时成本预警的预算成本项-->
-                    <el-form-item label="预算来源" v-if="timeBasecostList &&timeBasecostList.length>0">
+                    <el-form-item label="预算来源" v-if="user.company.packageProject==1&&timeBasecostList &&timeBasecostList.length>0">
                         <el-select v-model="domain.basecostId" :disabled="!canEdit" @change="$forceUpdate()">
                             <el-option v-for="item in timeBasecostList" :label="item.name" :value="item.id" :key="item.id"></el-option>
                         </el-select>
@@ -458,7 +458,7 @@
                             <span>{{projectList.filter(p=>p.id == domain.projectId)[0].projectDesc}}</span>
                         </el-form-item>
                         <!--如果设置了工时成本预警的预算成本项-->
-                        <el-form-item label="预算来源" v-if="timeBasecostList &&timeBasecostList.length>0">
+                        <el-form-item label="预算来源" v-if="user.company.packageProject==1&&timeBasecostList &&timeBasecostList.length>0">
                             <el-select v-model="domain.basecostId" :disabled="!canEdit" @change="$forceUpdate()">
                                 <el-option v-for="item in timeBasecostList" :label="item.name" :value="item.id" :key="item.id"></el-option>
                             </el-select>