anderx 3 years ago
parent
commit
615bad4498

+ 1 - 0
src/main/java/com/goafanti/common/controller/BaseController.java

@@ -167,6 +167,7 @@ public class BaseController {
 		if (TokenManager.hasRole(AFTConstants.TECH))str=str.append(8).append(",");
 		if (TokenManager.hasRole(AFTConstants.TECH_MANAGER))str=str.append(9).append(",");
 		if (TokenManager.hasRole(AFTConstants.TECH_ADMIN))str=str.append(10).append(",");
+		if (str.length()<1)return "";
 		String shiroList=str.substring(0,str.length()-1);
 		redisUtil.setString("shiroList",shiroList);
 		return shiroList;

+ 1 - 1
src/main/java/com/goafanti/order/controller/OrderChangeApiController.java

@@ -376,7 +376,7 @@ public class OrderChangeApiController extends CertifyApiController {
 		return res;
 	}
 	/**
-	 * 完成变更、完成变更
+	 * 完成变更、变更完成
 	 */
 	@RequestMapping(value ="/completeOrderChange",method = RequestMethod.GET)
 	public Result completeOrderChange(NewOrderChangeBo nb) {

+ 9 - 8
src/main/java/com/goafanti/user/controller/ExpertPublishController.java

@@ -18,10 +18,8 @@ import com.goafanti.user.service.UserService;
 @RequestMapping(value = "/api/admin/expert")
 public class ExpertPublishController extends BaseApiController {
 	@Resource
-	private UserService						userService;
-	@Resource
 	private ExpertPublishService			expertPublishService;
-	
+
 	/**
      * 成果发布
      */
@@ -32,28 +30,30 @@ public class ExpertPublishController extends BaseApiController {
             res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到专家", "专家"));
             return res;
         }
-        res.setData(expertPublishService.insertExpertPublish(e));     
+        res.setData(expertPublishService.insertExpertPublish(e));
         return res;
     }
+
     /**
      * 撤销发布
      */
     @RequestMapping(value = "/deletePublish", method = RequestMethod.GET)
     private Result deletePublish(String id) {
         Result res = new Result();
-        res.setData(expertPublishService.deletePublish(id));     
+        res.setData(expertPublishService.deletePublish(id));
         return res;
     }
+
     /**
      * 修改发布
      */
     @RequestMapping(value = "/updatePublish", method = RequestMethod.GET)
     private Result updatePublish(ExpertPublish e) {
         Result res = new Result();
-        res.setData(expertPublishService.updatePublish(e));     
+        res.setData(expertPublishService.updatePublish(e));
         return res;
     }
-    
+
     /**
      * 发布列表
      */
@@ -68,9 +68,10 @@ public class ExpertPublishController extends BaseApiController {
 			pageSize=10;
 		}
         res.setData(expertPublishService.listPublish( name, publishPlatform, publishClient, publishPage,
-        		 ifTop,  pageNo,  pageSize));     
+        		 ifTop,  pageNo,  pageSize));
         return res;
     }
+
     /**
      * 获取专家页面位置
      */

+ 26 - 28
src/main/java/com/goafanti/user/controller/UserChannelApiController.java

@@ -27,16 +27,15 @@ import com.goafanti.user.service.UserChannelService;
 @RestController
 @RequestMapping(value = "/api/user/channel")
 public class UserChannelApiController  extends CertifyApiController{
-	
+
 	@Resource
 	private UserChannelService 	userChannelService;
 	@Resource
 	private AttachmentService	attachmentService;
-	
-	
+
+
 	/**
 	 * 	新增渠道
-	 * 
 	 * @return
 	 */
 	@RequestMapping(value = "/add", method = RequestMethod.POST)
@@ -44,14 +43,14 @@ public class UserChannelApiController  extends CertifyApiController{
 		Result res = new Result();
 		if (StringUtils.isBlank(in.getUserName())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "用户名称"));
+			return  res;
 		}
 		res.setData(userChannelService.add(in));
 		return res;
 	}
-	
+
 	/**
 	 * 	删除渠道
-	 * 
 	 * @return
 	 */
 	@RequestMapping(value = "/delete", method = RequestMethod.POST)
@@ -59,15 +58,15 @@ public class UserChannelApiController  extends CertifyApiController{
 		Result res = new Result();
 		if (StringUtils.isBlank(ids)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "编号"));
+			return  res;
 		}
 		res.setData(userChannelService.delete(ids));
 		return res;
 	}
 
-	
+
 	/**
 	 * 	Excel批量导入渠道客户
-     * 
      * @return
      */
     @RequestMapping(value = "/import" , method = RequestMethod.POST)
@@ -83,30 +82,29 @@ public class UserChannelApiController  extends CertifyApiController{
         	  res.getError().add(buildError("格式不正确","格式不正确"));
         	  return res;
           }
-    	
-         res.data(userChannelService.batchListReceivables(file)); 
+
+         res.data(userChannelService.batchListReceivables(file));
     	return res;
     }
-    
-    
+
+
     /**
-  	 * 	已存在渠道客户列表
-       * 
-       * @return
-       */
+	 * 已存在渠道客户列表
+	 * @return
+	 */
       @RequestMapping(value = "/erorrList" , method = RequestMethod.GET)
       public Result erorrList(Integer pageNo,Integer pageSize)  {
     	  Result res =new Result();
     	  res.data(userChannelService.getErorrList(pageNo,pageSize));
   		 return  res;
       	}
-    
-    /**
-  	 * 	导出已存在渠道客户
-       * 
-       * @param response
-       * @return
-       */
+
+
+	/**
+	 * 导出已存在渠道客户
+	 * @param response
+	 * @return
+	 */
       @RequestMapping(value = "/export" , method = RequestMethod.GET)
       public Result exportReceivables(HttpServletResponse response)  {
     	  @SuppressWarnings("unchecked")
@@ -114,9 +112,9 @@ public class UserChannelApiController  extends CertifyApiController{
       	NewExcelUtil<OutUserChannel>excel=new NewExcelUtil<>(OutUserChannel.class);
   		 return  excel.exportExcel(list,"未导入渠道客户表",response);
       	}
+
       /**
-  	 * 	下载回款批量导入Excel模板
-       * 
+	   * 下载回款批量导入Excel模板
        * @param response
        * @return
        */
@@ -140,8 +138,8 @@ public class UserChannelApiController  extends CertifyApiController{
           }
           return res;
       }
-      
-      
-	
+
+
+
 
 }

+ 2 - 4
src/main/java/com/goafanti/user/controller/UserLoginController.java

@@ -11,7 +11,6 @@ import org.apache.shiro.web.util.SavedRequest;
 import org.apache.shiro.web.util.WebUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -40,7 +39,7 @@ public class UserLoginController extends BaseController {
 
 	@RequestMapping(value = "/login", method = RequestMethod.GET)
 	@ResponseBody
-	public Result login(HttpServletRequest request, Model model) {
+	public Result login() {
 		Result res = new Result();
 		TokenManager.logout();
 		return res;
@@ -74,12 +73,11 @@ public class UserLoginController extends BaseController {
 	 *
 	 * @param user
 	 * @param remember
-	 * @param request
 	 * @return
 	 */
 	@RequestMapping(value = "/mlogin", method = RequestMethod.POST)
 	@ResponseBody
-	public Result mLogin(User user, Boolean remember, HttpServletRequest request) {
+	public Result mLogin(User user, Boolean remember) {
 		Result res = new Result();
 		JSONObject jo = (JSONObject) JSON.toJSON(TokenManager.login(user, remember));