解决冲突

icssman-service/src/main/java/com/diagbot/facade/DeptInfoFacade.java

@@ -1,17 +1,8 @@
 package com.diagbot.facade;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.UserServiceClient;
-import com.diagbot.dto.DeptInfoDTO;
 import com.diagbot.dto.GetAllDeptsDTO;
 import com.diagbot.dto.GetDeptInfoDTO;
 import com.diagbot.dto.GetDeptNameDTO;

icssman-service/src/main/java/com/diagbot/facade/DictionaryFacade.java

@@ -5,6 +5,7 @@ import com.diagbot.entity.DictionaryInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.DictionaryInfoServiceImpl;
 import com.diagbot.util.EntityUtil;
+import com.diagbot.util.ListUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.LinkedHashMap;
@@ -25,9 +26,8 @@ public class DictionaryFacade extends DictionaryInfoServiceImpl {
      * @return
      */
     public Map<Long, List<DictionaryInfo>> getList() {
-        Map<Long, List<DictionaryInfo>> data = new LinkedHashMap<>();
         List<DictionaryInfo> list = this.list(new QueryWrapper<DictionaryInfo>()
-                .in("return_type", new Long[]{0L, 1L})
+                .in("return_type", ListUtil.arrayToList(new Long[]{0L, 1L}))
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .orderByAsc("group_type", "order_no"));
         return EntityUtil.makeEntityListMap(list, "groupType");