修改字典类型查询主子表详情信息接口

win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/dict/DictTypeController.java

@@ -1,11 +1,11 @@
 package com.win.module.system.controller.dict;
 
+
 import com.win.framework.common.enums.CommonStatusEnum;
 import com.win.framework.common.pojo.CommonResult;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.excel.core.util.ExcelUtils;
 import com.win.framework.operatelog.core.annotations.OperateLog;
-import com.win.module.system.controller.dict.vo.data.DictDataExcelVO;
 import com.win.module.system.controller.dict.vo.data.DictDataExportReqVO;
 import com.win.module.system.controller.dict.vo.data.DictDataSimpleRespVO;
 import com.win.module.system.controller.dict.vo.type.*;
@@ -15,7 +15,6 @@ import com.win.module.system.dal.dataobject.dict.DictDataDO;
 import com.win.module.system.dal.dataobject.dict.DictTypeDO;
 import com.win.module.system.service.dict.DictDataService;
 import com.win.module.system.service.dict.DictTypeService;
-import io.swagger.v3.core.util.Json;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -27,7 +26,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -110,9 +108,8 @@ public class DictTypeController {
     @Parameter(name = "types", description = "字典类型数组", required = false, example = "\"types\":[\"infra_config_type\",\"user_type\"]")
     @PreAuthorize("@ss.hasPermission('system:dict:query')")
     public CommonResult<List<DictTypeSimpleRespVO>> getByTypes(@RequestBody Map<String, List<String>> map) {
-        System.out.println(Json.pretty(map));
         List<String> types = map.get("types");
-        List<DictTypeDO> dictByTypes = dictTypeService.getDictByTypes(types, Collections.singleton(CommonStatusEnum.ENABLE.getStatus()));
+        List<DictTypeDO> dictByTypes = dictTypeService.getDictByTypes(types, CommonStatusEnum.ENABLE.getStatus());
         List<DictTypeSimpleRespVO> result = DictTypeConvert.INSTANCE.convertList(dictByTypes);
         for (DictTypeSimpleRespVO en:result){
             DictDataExportReqVO dictDataExportReqVO = new DictDataExportReqVO();

win-module-system/win-module-system-biz/src/main/java/com/win/module/system/dal/mysql/dict/DictTypeMapper.java

@@ -47,9 +47,9 @@ public interface DictTypeMapper extends BaseMapperX<DictTypeDO> {
     @Update("UPDATE system_dict_type SET deleted = 1, deleted_time = #{deletedTime} WHERE id = #{id}")
     void updateToDelete(@Param("id") Long id, @Param("deletedTime") LocalDateTime deletedTime);
 
-    default List<DictTypeDO> selectList(Collection<String> types, Collection<Integer> statuses) {
+    default List<DictTypeDO> selectList(Collection<String> types, Integer statuses) {
         return selectList(new LambdaQueryWrapperX<DictTypeDO>()
                 .inIfPresent(DictTypeDO::getType, types)
-                .inIfPresent(DictTypeDO::getStatus, statuses));
+                .eqIfPresent(DictTypeDO::getStatus, statuses));
     }
 }

win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/dict/DictTypeService.java

@@ -84,6 +84,6 @@ public interface DictTypeService {
      * @param types 字典类型数组。如果为空，不进行筛选
      * @return 字典类型列表详细
      */
-    List<DictTypeDO> getDictByTypes(@Nullable Collection<String> types, @Nullable Collection<Integer> statuses);
+    List<DictTypeDO> getDictByTypes(@Nullable Collection<String> types, Integer statuses);
 
 }

win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/dict/DictTypeServiceImpl.java

@@ -95,7 +95,7 @@ public class DictTypeServiceImpl implements DictTypeService {
     }
 
     @Override
-    public List<DictTypeDO> getDictByTypes(Collection<String> types, Collection<Integer> statuses) {
+    public List<DictTypeDO> getDictByTypes(Collection<String> types,Integer statuses) {
         return dictTypeMapper.selectList(types,statuses);
     }