修改bug

master
wangwei 2 years ago
parent d4bb8ca1af
commit deefec3fa6

@ -2,10 +2,13 @@ package com.glxp.api.controller.auth;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.entity.auth.DeptEntity;
import com.glxp.api.entity.auth.DeptUserEntity; import com.glxp.api.entity.auth.DeptUserEntity;
import com.glxp.api.req.auth.FilterDeptUserReqeust; import com.glxp.api.req.auth.FilterDeptUserReqeust;
import com.glxp.api.req.auth.FilterInvWarehouseRequest;
import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.auth.DeptUserResponse; import com.glxp.api.res.auth.DeptUserResponse;
import com.glxp.api.service.auth.DeptService;
import com.glxp.api.service.auth.DeptUserService; import com.glxp.api.service.auth.DeptUserService;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
@ -23,10 +26,16 @@ public class DeptUserController {
@Resource @Resource
DeptUserService deptUserService; DeptUserService deptUserService;
@Resource
DeptService deptService;
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("udi/auth/dept/user/filter") @GetMapping("udi/auth/dept/user/filter")
public BaseResponse filterList(FilterDeptUserReqeust filterDeptUserReqeust) { public BaseResponse filterList(FilterDeptUserReqeust filterDeptUserReqeust) {
//获取部门id
Long idByCode = deptService.getIdByCode(filterDeptUserReqeust.getDeptId());
filterDeptUserReqeust.setDeptId(idByCode);
List<DeptUserResponse> deptEntityList = deptUserService.selectJoinDeptUser(filterDeptUserReqeust); List<DeptUserResponse> deptEntityList = deptUserService.selectJoinDeptUser(filterDeptUserReqeust);
PageInfo<DeptUserResponse> pageInfo = new PageInfo<>(deptEntityList); PageInfo<DeptUserResponse> pageInfo = new PageInfo<>(deptEntityList);
PageSimpleResponse<DeptUserResponse> deptEntityPageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<DeptUserResponse> deptEntityPageSimpleResponse = new PageSimpleResponse<>();

@ -27,6 +27,9 @@ public interface DeptDao {
String getNameByCode(@Param("fromCorpId") String fromCorpId); String getNameByCode(@Param("fromCorpId") String fromCorpId);
Long getIdByCode(@Param("fromCorpId") Long fromCorpId);
/** /**
* *
* *

@ -31,6 +31,8 @@ public interface DeptService {
DeptEntity selectByName(String name); DeptEntity selectByName(String name);
Long getIdByCode( Long fromCorpId);
boolean deleteById(String id); boolean deleteById(String id);
List<DeptEntity> selectByNameList(String name); List<DeptEntity> selectByNameList(String name);

@ -110,6 +110,11 @@ public class DeptServiceImpl implements DeptService {
return null; return null;
} }
@Override
public Long getIdByCode(Long fromCorpId) {
return deptDao.getIdByCode(fromCorpId);
}
@Override @Override
public List<DeptEntity> selectByNameList(String name) { public List<DeptEntity> selectByNameList(String name) {
FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();

@ -172,6 +172,11 @@
from auth_dept from auth_dept
where code = #{fromCorpId} where code = #{fromCorpId}
</select> </select>
<select id="getIdByCode" resultType="java.lang.Long">
select id
from auth_dept
where code = #{fromCorpId}
</select>
<insert id="insertInvWarehouse" keyProperty="id" <insert id="insertInvWarehouse" keyProperty="id"
parameterType="com.glxp.api.entity.auth.DeptEntity"> parameterType="com.glxp.api.entity.auth.DeptEntity">
replace replace

Loading…
Cancel
Save