Bug修改

admin

2019-03-22 31c87f9868f01facd0c360ab49e3970beca9988d

 fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/HomeNavbarAdminController.java

@@ -6,10 +6,6 @@
import java.util.List;



import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;



import net.sf.json.JSONObject;



import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

@@ -22,24 +18,20 @@
import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.entity.bus.homemodule.HomeNavbar;

import com.yeshi.fanli.entity.bus.homemodule.SuperHomeNavbar;

import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.entity.system.System;

import com.yeshi.fanli.entity.system.BusinessSystem;

import com.yeshi.fanli.service.AdminUserService;

import com.yeshi.fanli.service.inter.config.SystemService;

import com.yeshi.fanli.service.inter.homemodule.HomeNavbarService;

import com.yeshi.fanli.service.inter.homemodule.SuperHomeNavbarService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.annotation.RequestNoLogin;



import net.sf.json.JSONObject;



@Controller

@RequestMapping("admin/new/api/v1/navbar")

public class HomeNavbarAdminController {



   @Resource

   private SystemService systemService;

	
   @Resource

   private AdminUserService adminUserService;

   

@@ -154,7 +146,7 @@
            HomeNavbar homeNavbar = new HomeNavbar();

            homeNavbar.setId(id);

            

            System system = new System();

            BusinessSystem system = new BusinessSystem();

            system.setId(systemId);

            

            SuperHomeNavbar superNavbar = new  SuperHomeNavbar();

@@ -322,19 +314,8 @@
    * @param response

    * @param out

    */

   @RequestNoLogin()

   @RequestMapping(value = "uploadPic")

   public void uploadPic(@RequestParam("file") CommonsMultipartFile file, Long uid,

         Long id,  HttpServletRequest request, HttpServletResponse response, PrintWriter out) {

		
      response.setHeader("Access-Control-Allow-Origin", "*");

      response.setHeader("Access-Control-Allow-Methods", "*");



      AdminUser admin = adminUserService.selectByPrimaryKey(uid);

      if (admin == null) {

         out.print(JsonUtil.loadFalseResult("当前账户验证失败"));

         return;

      }

   public void uploadPic(@RequestParam("file") CommonsMultipartFile file, Long id, PrintWriter out) {

      

      if (file == null) {

         out.print(JsonUtil.loadFalseResult("上传文件为空"));