diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.xml index 6aad368a..4d734203 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.xml +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.xml @@ -25,6 +25,7 @@ left join bank_manager bm on bm.sid =info.managerSid LEFT JOIN enterprise_information ei on ei.sid=info.enterpriseSid left join project_state_dictionary sd on sd.sid = info.stateSid + join user_project up on up.projectSid =info.sid ${ew.sqlSegment} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java index 85b29664..4aba5548 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java @@ -41,9 +41,9 @@ public class ProjectInformationRest implements ProjectInformationFeign { @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { + public ResultBean> listPage(@RequestBody PagerQuery pq,@RequestHeader("token") String token) { ResultBean rb = ResultBean.fireFail(); - PagerVo pv = ProjectInformationService.listPageVo(pq); + PagerVo pv = ProjectInformationService.listPageVo(pq,token); return rb.success().setData(pv); } @ApiOperation("查询全部") diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java index 5937e20e..a502932a 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java @@ -10,10 +10,8 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.supervise.crm.api.bankmanager.BankManager; -import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProject; import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectDto; import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectVo; -import com.yxt.supervise.crm.api.projectinformation.*; import com.yxt.supervise.crm.api.storehouseproject.StoreHouseProjectDto; import com.yxt.supervise.crm.api.storehouseproject.StoreHouseProjectVo; import com.yxt.supervise.crm.biz.bankmanager.BankManagerService; @@ -30,15 +28,14 @@ import com.yxt.supervise.crm.biz.projectzzfiles.ProjectZzFilesVo; import com.yxt.supervise.crm.biz.storehouseproject.StoreHouseProjectService; import com.yxt.supervise.crm.biz.userproject.UserProjectService; import com.yxt.supervise.crm.feign.system.SysOrganizationFeign; -import com.yxt.supervise.crm.feign.wh.StoreHouseProjectFeign; import com.yxt.supervise.system.sysorganization.SysOrganizationVo; import com.yxt.supervise.system.sysuser.SysUser; import com.yxt.supervise.system.sysuser.SysUserVo; -import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.*; @@ -69,9 +66,10 @@ public class ProjectInformationService extends MybatisBaseService listPageVo(PagerQuery pq) { + public PagerVo listPageVo(PagerQuery pq,String token) { ProjectInformationQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); + SysUserVo sysUserVo=sysUserFeign.loginDetailsNew(token).getData(); if (StringUtils.isNotBlank(query.getEntryName())) { qw.like("info.entryName", query.getEntryName()); } @@ -87,6 +85,7 @@ public class ProjectInformationService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); for(ProjectInformationVo vo:pagging.getRecords()){ diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/feign/system/SysUserFeign.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/feign/system/SysUserFeign.java index a6c52309..a0274cb7 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/feign/system/SysUserFeign.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/feign/system/SysUserFeign.java @@ -7,10 +7,7 @@ import com.yxt.supervise.system.sysuser.SysUserFeignFallback; import com.yxt.supervise.system.sysuser.SysUserVo; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.util.List; @@ -26,9 +23,9 @@ import java.util.List; public interface SysUserFeign { @PostMapping("/saveBank") public ResultBean saveBank(@RequestBody SysUserDto dto); - @PostMapping(value = "/loginDetails", headers = "token") + @PostMapping(value = "/loginDetailsNew") @ApiOperation("根据token值获取登录后的用户信息") - public ResultBean loginDetails(HttpServletRequest httpServletRequest); + public ResultBean loginDetailsNew(@RequestHeader("token") String token); @GetMapping("/getUserBySid") public ResultBean getUserBySid(@RequestParam("sid")String sid); @GetMapping("getUserByType")