1.请假流程结束回调接口修改

2.树形字典值显示和获取修改

boman-modules/boman-system/src/main/resources/mapper/system/SysDictDataMapper.xml

@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<select id="selectDictDataByType" parameterType="com.boman.domain.SysDictData" resultMap="SysDictDataResult">
 		<include refid="selectDictDataVo"/>
-		where status = '0' and dict_type = #{dictType} order by dict_sort asc
+		where status = '0' and dict_type = #{dictType} and parent_id is null order by dict_sort asc
 	</select>
 	
 	<select id="selectDictLabel" resultType="java.lang.String">

boman-web-core/src/main/java/com/boman/web/core/controller/AttendanceController.java

@@ -115,7 +115,7 @@ public class AttendanceController {
     }
 
     @PostMapping("/updateAttendance")
-    public AjaxResult updateAttendance(FormDataDto dto) {
+    public AjaxResult updateAttendance(@RequestBody FormDataDto dto) {
         return service.updateAttendance(dto);
     }
 

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

@@ -530,7 +530,8 @@ public class AttendanceServiceImpl implements AttendanceService {
                 Long id = Long.parseLong(jsonObject.get("id").toString());
                 UpdateDto uto = new UpdateDto();
                 uto.setTableName(tableName);
-                uto.setCondition(JSONObjectUtils.putValue("id",id,ATTENDANCE_TABLE_LEAVE_OR,"Y"));
+                uto.setCondition(JSONObjectUtils.putValue("id",id));
+                uto.setCommitData(JSONObjectUtils.putValue(ATTENDANCE_TABLE_LEAVE_OR,"Y"));
                 commonService.update(uto);
                 dateTimeUser.add(jsonObject.get(ATTENDANCE_TABLE_TODAYTIME).toString());
             }

boman-web-core/src/main/java/com/boman/web/core/utils/HandlerFormDataUtils.java

@@ -55,7 +55,8 @@ public class HandlerFormDataUtils {
                     String columnName = column.getColumnName();
                     if (string.equals(columnName) && isNotEmpty(dictType)) {
                         // 列表需要字典值的dictLabel, 不放入sysDictData
-                        List<SysDictData> sysDictData = column.getSysDictData();
+                        List<SysDictData> sysDictData = new ArrayList<>();
+                        genDictData(column.getSysDictData(),  sysDictData);
                         //获取到字段的值
                         String value = String.valueOf(jsonObject.get(string));
                         if (sysDictData != null && sysDictData.size() > 0){
@@ -72,6 +73,24 @@ public class HandlerFormDataUtils {
         }
     }
 
+    /**
+     * 获取所有的字典数据
+     * @param sysDictData
+     * @return
+     */
+    private static List<SysDictData> genDictData(List<SysDictData> datas, List<SysDictData> sysDictData) {
+        if(isEmpty(datas)) {
+            return sysDictData;
+        }
+        for(SysDictData dictData : datas) {
+            sysDictData.add(dictData);
+            if(isNotEmpty(dictData.getChildren())) {
+                genDictData(dictData.getChildren(), sysDictData);
+            }
+        }
+        return sysDictData;
+    }
+
     /**
      * 功能描述: 把timeStamp转为string, 默认类型为：YYYY_MM_DD
      *