|
@@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.apache.poi.ss.usermodel.Workbook;
|
|
|
import org.jeecg.common.api.vo.Result;
|
|
|
+import org.jeecg.common.system.entity.SysUser;
|
|
|
import org.jeecg.common.util.DateUtils;
|
|
|
import org.jeecg.ctop.material.constants.Check;
|
|
|
import org.jeecg.ctop.material.entity.vo.*;
|
|
@@ -1072,6 +1073,7 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
|
*
|
|
|
* @description: 运营组列表数据
|
|
@@ -1100,6 +1102,7 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
|
|
|
//查询用户角色
|
|
|
String roleCode = materialStareMapper.getRoleCodeByUserId(userId);
|
|
|
+ JSONObject userName = materialStareMapper.getKuaiShouUserByUserId(userId);
|
|
|
|
|
|
List<KuaiShouOperateGroupVo> operationManagerList = new ArrayList<>();
|
|
|
if ("admin".equals(roleCode)) {
|
|
@@ -1107,7 +1110,7 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
//查询运营经理
|
|
|
operationManagerList = materialStareMapper.getOperationManagerUser();
|
|
|
}else if (roleCode.contains("OperationManager")){
|
|
|
- operationManagerList.add(new KuaiShouOperateGroupVo(userId));
|
|
|
+ operationManagerList.add(new KuaiShouOperateGroupVo(userId,userName.getString("userName")));
|
|
|
}else {
|
|
|
Result.successMsg("运营组列表数据查询成功。",null);
|
|
|
}
|
|
@@ -1199,13 +1202,14 @@ public class MaterialStareServiceImpl implements MaterialStareService {
|
|
|
|
|
|
//查询用户角色
|
|
|
String roleCode = materialStareMapper.getRoleCodeByUserId(userId);
|
|
|
+ JSONObject userName = materialStareMapper.getKuaiShouUserByUserId(userId);
|
|
|
|
|
|
List<KuaiShouOperateGroupVo> operationManagerList = new ArrayList<>();
|
|
|
if ("admin".equals(roleCode)) {
|
|
|
//查询运营经理
|
|
|
operationManagerList = materialStareMapper.getOperationManagerUser();
|
|
|
}else if (roleCode.contains("OperationManager")){
|
|
|
- operationManagerList.add(new KuaiShouOperateGroupVo(userId));
|
|
|
+ operationManagerList.add(new KuaiShouOperateGroupVo(userId,userName.getString("userName")));
|
|
|
}else {
|
|
|
Result.successMsg("运营组列表数据查询成功。",null);
|
|
|
}
|