From 5ffa5d2c1cf6015815a77ed1042313aca1d9fc37 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 22 Jul 2021 11:56:12 +0800
Subject: [PATCH] fix
---
gc-user/src/main/java/com/xzx/gc/user/controller/ApiJhyInfoController.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/gc-user/src/main/java/com/xzx/gc/user/controller/ApiJhyInfoController.java b/gc-user/src/main/java/com/xzx/gc/user/controller/ApiJhyInfoController.java
index 2655032..2e4b6ed 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/controller/ApiJhyInfoController.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/controller/ApiJhyInfoController.java
@@ -1,6 +1,7 @@
package com.xzx.gc.user.controller;
import com.xzx.gc.common.Result;
+import com.xzx.gc.common.annotations.PassToken;
import com.xzx.gc.common.request.BaseController;
import com.xzx.gc.model.JsonResult;
import com.xzx.gc.user.dto.JhyApplyDto;
@@ -42,15 +43,34 @@
return Result.success(status);
}
+ @PassToken
@ApiOperation("是否集货员")
@GetMapping(value = "/jhy/isJhy")
public JsonResult<Map<String, Object>> isJhy(HttpServletRequest request) {
- boolean flag = jhyInfoService.isJhy(getUserId(request));
+ int flag = jhyInfoService.isJhy(getUserId(request));
Map<String, Object> map = new HashMap<>();
- map.put("flag", flag);
- map.put("icon", "../../images/icon_entrance.png");
- map.put("name", "成为集物员");
- map.put("path", "../../subcontract1/become_sgm/become_sgm");
+ map.put("flag", flag == 1);
+ switch (flag) {
+ case 0:
+ map.put("icon", "../../images/icon_entrance.png");
+ map.put("name", "成为集物员");
+ map.put("path", "../../subcontract1/become_sgm/become_sgm");
+ break;
+ case 1:
+ map.put("icon", "../../images/icon_team.png");
+ map.put("name", "集物员订单");
+ map.put("path", "../../collectPersonnel/GCOrderForm/index");
+ break;
+ case 2:
+ map.put("icon", "../../images/icon_entrance.png");
+ map.put("name", "集物员待审核");
+ map.put("path", "../../pages/home/home");
+ break;
+ default:
+ map.put("icon", "../../images/icon_entrance.png");
+ map.put("name", "成为集物员");
+ map.put("path", "../../subcontract1/become_sgm/become_sgm");
+ }
return JsonResult.success(map);
}
}
--
Gitblit v1.9.1