Merge remote-tracking branch 'origin/master'

czt

3 天以前 b1e6bf7d3ed1a1d64182127f83fdc3fad2233a7e

 fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/file/FileController.java

@@ -23,7 +23,7 @@
 */
@Slf4j
@Controller
@RequestMapping("basic/file")
@RequestMapping("file")
public class FileController {

   @Resource
@@ -35,15 +35,12 @@
    * @return
    */
   @RequestMapping("/dept-img")
   public String deptImg(@RequestParam(value = "id", required = true) String id,
   public String deptImg(@RequestParam(value = "imgPath", required = true) String imgPath,
                    ModelMap view) {

      if(StringUtils.isNotEmpty(id)){
         String imgPath = fileManager.getDeptFile(id);;
         view.put("imgPath", imgPath);
      }
      view.put("imgPath", imgPath);

      return "web/common/preview-img";
      return "common/preview-img";
   }