fix 修改字典表,添加父id

boman-web-core/src/main/java/com/boman/web/core/mapper/StandardlyMapper.java

@@ -206,7 +206,7 @@ public interface StandardlyMapper {
             "LEFT JOIN sys_dept d ON d.id = t.dept_id \n" +
             "<where>" +
             "1=1 " +
-            "<if test='name != null and name != '''>and ( d.dept_name like concat('%', #{name}, '%') or t.attendance_table_username like concat('%', #{name}, '%'))</if>"+
+            "<if test=\"name != null and name != ''\">and ( d.dept_name like concat('%', #{name}, '%') or t.attendance_table_username like concat('%', #{name}, '%'))</if>"+
             "<if test='date!=null'>and DATE_FORMAT(t.create_time,'%Y-%m') = #{date} </if>"+
             "</where>" +
             "GROUP BY\n" +

boman-web-core/src/main/java/com/boman/web/core/service/attendance/AttendanceServiceImpl.java

@@ -352,6 +352,9 @@ public class AttendanceServiceImpl implements AttendanceService {
         int page = ((Integer) map.get("page"));
         int pageSize = ((Integer) map.get("pageSize"));
         int pageNo = (page - 1) * pageSize;
+        if("null".equals(name)){
+            name = "";
+        }
         List<JSONObject> jsonObjects = standardlyMapper.statisticsByMonth(date, name, pageNo, pageSize);
         return AjaxResult.success(jsonObjects);
     }