From e36aa4e9b9f061da11587fbd2580b065a661364a Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 03 四月 2024 09:51:05 +0800
Subject: [PATCH] bug修复
---
meiya-admin/src/main/java/com/sinata/modular/member/controller/MemUserSalesController.java | 167 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 113 insertions(+), 54 deletions(-)
diff --git a/meiya-admin/src/main/java/com/sinata/modular/member/controller/MemUserSalesController.java b/meiya-admin/src/main/java/com/sinata/modular/member/controller/MemUserSalesController.java
index 09e0afd..ca36302 100644
--- a/meiya-admin/src/main/java/com/sinata/modular/member/controller/MemUserSalesController.java
+++ b/meiya-admin/src/main/java/com/sinata/modular/member/controller/MemUserSalesController.java
@@ -78,7 +78,12 @@
*/
@RequestMapping("")
public String index(Model model) {
- return PREFIX + "memUserSales.html";
+ boolean admin = ShiroKit.isAdmin();
+ if (admin) {
+ return PREFIX + "memUserSales.html";
+ } else {
+ return PREFIX + "memUserSalesAuth.html";
+ }
}
@ResponseBody
@@ -259,65 +264,117 @@
@ResponseBody
@RequestMapping(value = "/export")
public void export(String beginTime, String endTime, String nickName, String phone, String showId, Integer isLock, Integer isLeaveOffice, Integer memberGradeId, HttpServletResponse response) {
+ boolean admin = ShiroKit.isAdmin();
List<Map<String, Object>> list = this.wrapperList(null, beginTime, endTime, nickName, phone, showId, isLock, isLeaveOffice, memberGradeId);
// 表格数据【封装】
List<List<Object>> dataList = new ArrayList<>();
-
- // 头部列【封装】
- List<Object> shellList = new ArrayList<>();
- shellList.add("工号");
- shellList.add("提交时间");
- shellList.add("推荐人工号");
- shellList.add("推荐人");
- shellList.add("推荐人所在城市");
- shellList.add("姓名");
- shellList.add("性别");
- shellList.add("生日");
- shellList.add("联系电话");
- shellList.add("证件类型");
- shellList.add("证件号码");
- shellList.add("银行卡号");
- shellList.add("品行分");
- shellList.add("审核状态");
- shellList.add("佣金等级");
- shellList.add("积分");
- shellList.add("入司时间");
- shellList.add("状态");
- shellList.add("城市合伙人工号");
- shellList.add("城市合伙人团队");
- shellList.add("市场总监工号");
- shellList.add("市场总监团队");
- dataList.add(shellList);
-
- // 详细数据列【封装】
- for (Map<String, Object> map : list) {
- shellList = new ArrayList<>();
- shellList.add(map.get("show_id"));
- shellList.add(map.get("apply_time"));
- shellList.add(map.get("equityUserShowId"));
- shellList.add(map.get("equityUserRealName"));
- shellList.add(map.get("equityUserCityCode"));
- shellList.add(map.get("real_name"));
- shellList.add(map.get("sex"));
- shellList.add(map.get("birthday"));
- shellList.add(map.get("phone"));
- shellList.add(Convert.toInt(map.get("card_type")) == 0 ? "身份证" : "护照");
- shellList.add(map.get("id_card"));
- shellList.add(map.get("bank_number"));
- shellList.add(map.get("credit_score"));
- shellList.add(EnumAuditState.getMarkByIndex(Convert.toInt(map.get("audit_state"))));
- shellList.add(EnumMemberGrade.getAliasByIndex(Convert.toInt(map.get("member_grade_id"))));
- shellList.add(map.get("integral"));
- shellList.add(map.get("audit_time"));
- Integer isLeaveOfficeNum = Convert.toInt(map.get("is_leave_office"));
- shellList.add(isLeaveOfficeNum == 0 ? "在职" : isLeaveOfficeNum == 1 ? "离职" : "-");
- shellList.add(map.get("v4ShowId"));
- shellList.add(map.get("v4Team"));
- shellList.add(map.get("v5ShowId"));
- shellList.add(map.get("v5Team"));
+ if (admin) {
+ // 头部列【封装】
+ List<Object> shellList = new ArrayList<>();
+ shellList.add("工号");
+ shellList.add("提交时间");
+ shellList.add("推荐人工号");
+ shellList.add("推荐人");
+ shellList.add("推荐人所在城市");
+ shellList.add("姓名");
+ shellList.add("性别");
+ shellList.add("生日");
+ shellList.add("联系电话");
+ shellList.add("证件类型");
+ shellList.add("证件号码");
+ shellList.add("银行卡号");
+ shellList.add("品行分");
+ shellList.add("审核状态");
+ shellList.add("佣金等级");
+ shellList.add("积分");
+ shellList.add("入司时间");
+ shellList.add("状态");
+ shellList.add("城市合伙人工号");
+ shellList.add("城市合伙人团队");
+ shellList.add("市场总监工号");
+ shellList.add("市场总监团队");
dataList.add(shellList);
+
+ // 详细数据列【封装】
+ for (Map<String, Object> map : list) {
+ shellList = new ArrayList<>();
+ shellList.add(map.get("show_id"));
+ shellList.add(map.get("apply_time"));
+ shellList.add(map.get("equityUserShowId"));
+ shellList.add(map.get("equityUserRealName"));
+ shellList.add(map.get("equityUserCityCode"));
+ shellList.add(map.get("real_name"));
+ shellList.add(map.get("sex"));
+ shellList.add(map.get("birthday"));
+ shellList.add(map.get("phone"));
+ shellList.add(Convert.toInt(map.get("card_type")) == 0 ? "身份证" : "护照");
+ shellList.add(map.get("id_card"));
+ shellList.add(map.get("bank_number"));
+ shellList.add(map.get("credit_score"));
+ shellList.add(EnumAuditState.getMarkByIndex(Convert.toInt(map.get("audit_state"))));
+ shellList.add(EnumMemberGrade.getAliasByIndex(Convert.toInt(map.get("member_grade_id"))));
+ shellList.add(map.get("integral"));
+ shellList.add(map.get("audit_time"));
+ Integer isLeaveOfficeNum = Convert.toInt(map.get("is_leave_office"));
+ shellList.add(isLeaveOfficeNum == 0 ? "在职" : isLeaveOfficeNum == 1 ? "离职" : "-");
+ shellList.add(map.get("v4ShowId"));
+ shellList.add(map.get("v4Team"));
+ shellList.add(map.get("v5ShowId"));
+ shellList.add(map.get("v5Team"));
+ dataList.add(shellList);
+ }
+ } else {
+ // 头部列【封装】
+ List<Object> shellList = new ArrayList<>();
+ shellList.add("工号");
+ shellList.add("提交时间");
+ shellList.add("推荐人工号");
+ shellList.add("推荐人");
+ shellList.add("推荐人所在城市");
+ shellList.add("姓名");
+ shellList.add("性别");
+ shellList.add("生日");
+ shellList.add("证件类型");
+ shellList.add("品行分");
+ shellList.add("审核状态");
+ shellList.add("佣金等级");
+ shellList.add("积分");
+ shellList.add("入司时间");
+ shellList.add("状态");
+ shellList.add("城市合伙人工号");
+ shellList.add("城市合伙人团队");
+ shellList.add("市场总监工号");
+ shellList.add("市场总监团队");
+ dataList.add(shellList);
+
+ // 详细数据列【封装】
+ for (Map<String, Object> map : list) {
+ shellList = new ArrayList<>();
+ shellList.add(map.get("show_id"));
+ shellList.add(map.get("apply_time"));
+ shellList.add(map.get("equityUserShowId"));
+ shellList.add(map.get("equityUserRealName"));
+ shellList.add(map.get("equityUserCityCode"));
+ shellList.add(map.get("real_name"));
+ shellList.add(map.get("sex"));
+ shellList.add(map.get("birthday"));
+ shellList.add(Convert.toInt(map.get("card_type")) == 0 ? "身份证" : "护照");
+ shellList.add(map.get("credit_score"));
+ shellList.add(EnumAuditState.getMarkByIndex(Convert.toInt(map.get("audit_state"))));
+ shellList.add(EnumMemberGrade.getAliasByIndex(Convert.toInt(map.get("member_grade_id"))));
+ shellList.add(map.get("integral"));
+ shellList.add(map.get("audit_time"));
+ Integer isLeaveOfficeNum = Convert.toInt(map.get("is_leave_office"));
+ shellList.add(isLeaveOfficeNum == 0 ? "在职" : isLeaveOfficeNum == 1 ? "离职" : "-");
+ shellList.add(map.get("v4ShowId"));
+ shellList.add(map.get("v4Team"));
+ shellList.add(map.get("v5ShowId"));
+ shellList.add(map.get("v5Team"));
+ dataList.add(shellList);
+ }
}
+
try {
String title = "营销员";
// 调用工具类进行导出
@@ -478,6 +535,8 @@
*/
@RequestMapping(value = "/detail/{memUserId}")
public Object detail(@PathVariable("memUserId") Integer memUserId, Model model) {
+ boolean admin = ShiroKit.isAdmin();
+ model.addAttribute("isAdmin", admin);
// 个人信息
MemUser memUser = memUserService.selectById(memUserId);
if (memUser != null) {
--
Gitblit v1.7.1