|
@@ -20,6 +20,7 @@ import org.jeecg.common.system.query.QueryGenerator;
|
|
import org.jeecg.common.system.vo.LoginUser;
|
|
import org.jeecg.common.system.vo.LoginUser;
|
|
import org.jeecg.common.util.DateUtils;
|
|
import org.jeecg.common.util.DateUtils;
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
|
|
+import org.jeecg.modules.ctop.service.IProjectMemberService;
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
|
import org.jeecgframework.poi.excel.entity.ExportParams;
|
|
import org.jeecgframework.poi.excel.entity.ExportParams;
|
|
@@ -89,6 +90,9 @@ public class MaterialInfoController {
|
|
* @param req
|
|
* @param req
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
|
|
+ @Autowired
|
|
|
|
+ private IProjectMemberService memberService;
|
|
|
|
+
|
|
@AutoLog(value = "素材信息-分页列表查询")
|
|
@AutoLog(value = "素材信息-分页列表查询")
|
|
@ApiOperation(value = "素材信息-分页列表查询", notes = "素材信息-分页列表查询")
|
|
@ApiOperation(value = "素材信息-分页列表查询", notes = "素材信息-分页列表查询")
|
|
@GetMapping(value = "/list")
|
|
@GetMapping(value = "/list")
|
|
@@ -98,24 +102,40 @@ public class MaterialInfoController {
|
|
HttpServletRequest req) {
|
|
HttpServletRequest req) {
|
|
|
|
|
|
Result<IPage<MaterialInfo>> result = new Result<>();
|
|
Result<IPage<MaterialInfo>> result = new Result<>();
|
|
|
|
+ QueryWrapper<MaterialInfo> queryWrapper = new QueryWrapper<>();
|
|
Object createTime = materialInfo.getCreateTime();
|
|
Object createTime = materialInfo.getCreateTime();
|
|
materialInfo.setCreateTime(null);
|
|
materialInfo.setCreateTime(null);
|
|
if (!Check.isNull(materialInfo.getUserId())) {
|
|
if (!Check.isNull(materialInfo.getUserId())) {
|
|
String roleCode = materialInfoService.getRoleCodeByUserId(materialInfo.getUserId());
|
|
String roleCode = materialInfoService.getRoleCodeByUserId(materialInfo.getUserId());
|
|
- if ("admin".equals(roleCode) || "operator".equals(roleCode) || "kuaishouOperationManager".equals(roleCode) || "operationAssistant".equals(roleCode)) {
|
|
|
|
|
|
+ if ("admin".equals(roleCode) || "operator".equals(roleCode) || "kuaishouOperationManager".equals(roleCode) || "operationAssistant".equals(roleCode) || "touTiaoOperationManager".equals(roleCode)) {
|
|
|
|
+ materialInfo.setUserId(null);
|
|
|
|
+ queryWrapper = QueryGenerator.initQueryWrapper(materialInfo, req.getParameterMap());
|
|
|
|
+ } else if ("designTeamLeader".equals(roleCode) || "planeLeader".equals(roleCode) || "plane".equals(roleCode) || "plan".equals(roleCode)) {
|
|
|
|
+ String userId = materialInfo.getUserId();
|
|
materialInfo.setUserId(null);
|
|
materialInfo.setUserId(null);
|
|
|
|
+ queryWrapper = QueryGenerator.initQueryWrapper(materialInfo, req.getParameterMap());
|
|
|
|
+ List<Long> projects = memberService.selectProjectsByUserId(userId);
|
|
|
|
+ if (!Check.isNull(projects)) {
|
|
|
|
+ queryWrapper.in("project_id", projects);
|
|
|
|
+ } else {
|
|
|
|
+ result.setSuccess(true);
|
|
|
|
+ result.setResult(null);
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ queryWrapper = QueryGenerator.initQueryWrapper(materialInfo, req.getParameterMap());
|
|
}
|
|
}
|
|
- }
|
|
|
|
- QueryWrapper<MaterialInfo> queryWrapper = QueryGenerator.initQueryWrapper(materialInfo, req.getParameterMap());
|
|
|
|
- if (!Check.isNull(createTime)) {
|
|
|
|
- try {
|
|
|
|
- Map<String, Object> map = DateUtils.getStartEndTime(createTime.toString());
|
|
|
|
- queryWrapper.ge("create_time", map.get("start"));
|
|
|
|
- queryWrapper.lt("create_time", map.get("end"));
|
|
|
|
- } catch (ParseException e) {
|
|
|
|
- e.printStackTrace();
|
|
|
|
|
|
+ if (!Check.isNull(createTime)) {
|
|
|
|
+ try {
|
|
|
|
+ Map<String, Object> map = DateUtils.getStartEndTime(createTime.toString());
|
|
|
|
+ queryWrapper.ge("create_time", map.get("start"));
|
|
|
|
+ queryWrapper.lt("create_time", map.get("end"));
|
|
|
|
+ } catch (ParseException e) {
|
|
|
|
+ e.printStackTrace();
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
Page<MaterialInfo> page = new Page<>(pageNo, pageSize);
|
|
Page<MaterialInfo> page = new Page<>(pageNo, pageSize);
|
|
IPage<MaterialInfo> pageList = materialInfoService.page(page, queryWrapper);
|
|
IPage<MaterialInfo> pageList = materialInfoService.page(page, queryWrapper);
|
|
result.setSuccess(true);
|
|
result.setSuccess(true);
|