fix 修改字典表,添加父id

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysDictDataServiceImpl.java

@@ -124,7 +124,8 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
     @Override
     public List<SysDictData> selectTreeSelect(String dictType) {
         List<SysDictData> sysDictData = dictDataMapper.selectDictDataByType(dictType);
-        return recursionFn(sysDictData);
+        recursionFn(sysDictData);
+        return sysDictData;
     }
 
     /**
@@ -132,14 +133,14 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
      *
      * @param sysDictData 子节点列表
      */
-    private List<SysDictData> recursionFn(List<SysDictData> sysDictData) {
-        if (sysDictData.size() > 0){
+    private void recursionFn(List<SysDictData> sysDictData) {
+        if (sysDictData.size() > 0) {
             //获取所有节点的id
             List<Long> allDictDataId = map(sysDictData, SysDictData::getId);
             //获得所有节点的子节点
             List<SysDictData> sysDictDataList = dictDataMapper.selectDictDataByParentId(allDictDataId);
             //如果子节点有数据
-            if (sysDictDataList.size() > 0){
+            if (sysDictDataList.size() > 0) {
                 for (SysDictData dictData : sysDictData) {
                     //找到对应的子节点
                     List<SysDictData> childList = getChildList(sysDictDataList, dictData);
@@ -148,15 +149,15 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
                 recursionFn(sysDictDataList);
             }
         }
-        return sysDictData;
     }
-        /**
-         * 功能描述: 获取menu下所有的子节点
-         *
-         * @param allDictData 所有的
-         * @param dictData     父节点
-         * @return java.util.List<com.boman.domain.SysMenu>
-         */
+
+    /**
+     * 功能描述: 获取menu下所有的子节点
+     *
+     * @param allDictData 所有的
+     * @param dictData    父节点
+     * @return java.util.List<com.boman.domain.SysMenu>
+     */
 
     private List<SysDictData> getChildList(List<SysDictData> allDictData, SysDictData dictData) {
         //定义子节点

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

@@ -199,7 +199,7 @@ public class AttendanceServiceImpl implements AttendanceService {
     public String showAttendanceType(String tableName, String userName) {
         requireNonNull(tableName, "tableName is empty");
         requireNonNull(userName, "userName is empty");
-        JSONObject attendanceTableUsername = commonService.getOneByMap(tableName, JSONObjectUtils.putValue("attendance_table_username", userName, ATTENDANCE_TABLE_TODAYTIME, Lists.newArrayList(DateUtils.getDate())));
+        JSONObject attendanceTableUsername = commonService.getOneByMap(tableName, JSONObjectUtils.putValue("attendance_table_username", userName, ATTENDANCE_TABLE_TODAYTIME, DateUtils.getDate()));
         GregorianCalendar ca = new GregorianCalendar();
         int result = ca.get(GregorianCalendar.AM_PM);
         if (0 == result){
@@ -532,7 +532,7 @@ public class AttendanceServiceImpl implements AttendanceService {
     private List<JSONObject> listByUserNameAndTime(String tableName, String userName, String time) {
         JSONObject condition = new JSONObject(2);
         condition.put(ATTENDANCE_USER_NAME, userName);
-        condition.put(ATTENDANCE_TABLE_TODAYTIME, Lists.newArrayList(time));
+        condition.put(ATTENDANCE_TABLE_TODAYTIME, time);
         return commonService.getByMap(tableName, condition);
     }