图片配置修改完善

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiImgConfigController.java

@@ -5,10 +5,7 @@ import com.elink.esua.epdc.dto.form.EpdcAppImgTypeListFormDTO;
 import com.elink.esua.epdc.dto.result.EpdcImgConfigResultDTO;
 import com.elink.esua.epdc.service.ImgConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ImgConfigServiceImpl.java

@@ -122,7 +122,7 @@ public class ImgConfigServiceImpl extends BaseServiceImpl<ImgConfigDao, ImgConfi
     public Result<List<EpdcImgConfigResultDTO>> listImgUrlByTypeList(EpdcAppImgTypeListFormDTO epdcAppImgTypeListFormDTO) {
         QueryWrapper<ImgConfigEntity> queryWrapper = new QueryWrapper();
         queryWrapper.eq("ENABLE_FLAG",1);
-        queryWrapper.in(epdcAppImgTypeListFormDTO.getImageTypes().size()>0,"IMG_TYPE",epdcAppImgTypeListFormDTO.getImageTypes());
+        queryWrapper.in(epdcAppImgTypeListFormDTO.getImageTypes()!=null && epdcAppImgTypeListFormDTO.getImageTypes().size()>0,"IMG_TYPE",epdcAppImgTypeListFormDTO.getImageTypes());
         List<ImgConfigEntity> imgConfigEntities = baseDao.selectList(queryWrapper);
         List<EpdcImgConfigResultDTO> epdcImgConfigResultDTOS = ConvertUtils.sourceToTarget(imgConfigEntities, EpdcImgConfigResultDTO.class);
         return new Result<List<EpdcImgConfigResultDTO>>().ok(epdcImgConfigResultDTOS);