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

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

@@ -53,7 +53,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
     @Resource
     private LeaveSheetMapper leaveSheetMapper;
     @Resource
-    private AuditWorkflowSetting auditWorkflowSetting;
+    private AuditWorkflowSettingMapper auditWorkflowSettingMapper;
     //新增部门
     @Override
     public HttpRespMsg insertDepartment(String departmentName, Integer superiorId, String managerId, String reportAuditUserid,  HttpServletRequest request) {
@@ -197,7 +197,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
                 httpRespMsg.setError("当前部门已被工时审批流数据使用");
                 return httpRespMsg;
             }
-            Integer auditWorkflowSettingCut = auditWorkflowSetting.selectCount(new QueryWrapper<AuditWorkflowSetting>().eq("audit_dept_id", departmentId));
+            Integer auditWorkflowSettingCut = auditWorkflowSettingMapper.selectCount(new QueryWrapper<AuditWorkflowSetting>().eq("audit_dept_id", departmentId));
             if(auditWorkflowSettingCut>0){
                 httpRespMsg.setError("当前部门已被请假出差审批流数据使用");
                 return httpRespMsg;