|
|
@@ -2,10 +2,7 @@ package com.ruoyi.system.controller;
|
|
|
|
|
|
import java.io.IOException;
|
|
|
import java.io.UnsupportedEncodingException;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-import java.util.Set;
|
|
|
+import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
@@ -15,7 +12,10 @@ import com.ruoyi.common.redis.service.RedisIdGenerator;
|
|
|
import com.ruoyi.common.redis.service.RedisService;
|
|
|
import com.ruoyi.logistics.domain.BizWaybillOrder;
|
|
|
import com.ruoyi.logistics.domain.LogisticsOrder;
|
|
|
+import com.ruoyi.logistics.domain.SysDeptRate;
|
|
|
+import com.ruoyi.logistics.service.ISysDeptRateService;
|
|
|
import com.ruoyi.logistics.service.LogisticsOrderService;
|
|
|
+import org.apache.commons.collections4.CollectionUtils;
|
|
|
import org.apache.commons.lang3.ArrayUtils;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
@@ -79,6 +79,9 @@ public class SysUserController extends BaseController
|
|
|
@Autowired
|
|
|
private TokenService tokenService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ISysDeptRateService sysDeptRateService;
|
|
|
+
|
|
|
/**
|
|
|
* 获取用户列表
|
|
|
*/
|
|
|
@@ -204,6 +207,28 @@ public class SysUserController extends BaseController
|
|
|
ajax.put("permissions", permissions);
|
|
|
ajax.put("isDefaultModifyPwd", initPasswordIsModify(user.getPwdUpdateDate()));
|
|
|
ajax.put("isPasswordExpired", passwordIsExpiration(user.getPwdUpdateDate()));
|
|
|
+
|
|
|
+
|
|
|
+ SysDeptRate sysDeptRate = new SysDeptRate();
|
|
|
+ sysDeptRate.setDeptId(user.getDeptId());
|
|
|
+ List<SysDeptRate> sysDeptRates = sysDeptRateService.selectSysDeptRateList(sysDeptRate);
|
|
|
+
|
|
|
+ // 判断物流公司类型是否存在
|
|
|
+ Map<String, Boolean> companyTypeMap = new HashMap<>();
|
|
|
+ companyTypeMap.put("jd", false);
|
|
|
+ companyTypeMap.put("sf", false);
|
|
|
+
|
|
|
+ if (CollectionUtils.isNotEmpty(sysDeptRates)) {
|
|
|
+ for (SysDeptRate rate : sysDeptRates) {
|
|
|
+ if ("1".equals(rate.getCompanyType())) {
|
|
|
+ companyTypeMap.put("jd", true);
|
|
|
+ } else if ("2".equals(rate.getCompanyType())) {
|
|
|
+ companyTypeMap.put("sf", true);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ ajax.put("menu", companyTypeMap);
|
|
|
return ajax;
|
|
|
}
|
|
|
|