修复bug

src/main/java/com/fdkankan/fusion/common/util/DateUtils.java

@@ -67,6 +67,7 @@ public class DateUtils {
 
 
     public static void main(String[] args) {
-        System.out.println(getMonthdateList(getYearAgo(),getMonthStr(new Date())));
+       // System.out.println(getMonthdateList(getYearAgo(),getMonthStr(new Date())));
+        System.out.println(getYearAgo());
     }
 }

src/main/java/com/fdkankan/fusion/request/DataParam.java

@@ -15,15 +15,15 @@ public class DataParam {
 
     public String getStartTime() {
         if(StringUtils.isBlank(startTime)){
-            return DateUtils.getYearAgo();
+            return DateUtils.getYearAgo() + " 00:00:00";
         }
-        return startTime;
+        return startTime + " 00:00:00";
     }
 
     public String getEndTime() {
         if(StringUtils.isBlank(endTime)){
-            return DateUtils.getMonthStr(new Date());
+            return DateUtils.getMonthStr(new Date()) + " 23:59:59";
         }
-        return endTime;
+        return endTime + " 23:59:59";
     }
 }

src/main/java/com/fdkankan/fusion/service/impl/TmDepartmentServiceImpl.java

@@ -79,7 +79,7 @@ public class TmDepartmentServiceImpl extends ServiceImpl<ITmDepartmentMapper, Tm
         if(dept.getId().equals(dept.getParentId())){
             throw new BusinessException(ResultCode.DEPT_EDIT_ERROR);
         }
-        if(dept.getLevel() >4){
+        if(dept.getLevel() != null && dept.getLevel() >4){
             throw new BusinessException(ResultCode.DEPT_ADD_ERROR);
         }
         List<TmDepartment> sonByDeptId = this.getSonByDeptId(dept.getId());
@@ -197,7 +197,7 @@ public class TmDepartmentServiceImpl extends ServiceImpl<ITmDepartmentMapper, Tm
         if(tmDepartment == null){
             throw new BusinessException(ResultCode.NOT_DEPT.code,ResultCode.NOT_DEPT.msg +":"+deptId);
         }
-        if(tmDepartment.getDeptType()==1 ){
+        if(tmDepartment.getDeptType()==0 || tmDepartment.getDeptType()==1 ){
             return tmDepartment.getId();
         }
         return getZdDeptId(tmDepartment.getParentId());