修改bug

master
wangwei 2 years ago
parent 9e42e8ee52
commit f49fb06de3

@ -102,6 +102,7 @@ public class AuthUserController extends BaseController {
FilterNoSelectUserRequest filterNoSelectUserRequest = new FilterNoSelectUserRequest();
BeanUtils.copyProperties(filterInvLinkDataRequest, filterNoSelectUserRequest);
filterNoSelectUserRequest.setUserIds(userIds);
filterNoSelectUserRequest.setLocDeptCode(filterInvLinkDataRequest.getParentId());
List<AuthAdmin> hospitalUserList = authAdminService.selectNotSelectUser(filterNoSelectUserRequest);
PageInfo<AuthAdmin> authAdminPageInfo = new PageInfo<>(hospitalUserList);
PageSimpleResponse<AuthAdmin> authAdminPageSimpleResponse = new PageSimpleResponse<>();

@ -74,7 +74,7 @@ public interface AuthAdminDao {
*/
List<AuthAdmin> selectHospitalUser();
List<AuthAdmin> selectNotSelectUser(@Param("userIds") List<Long> userIds);
List<AuthAdmin> selectNotSelectUser(@Param("userIds") List<Long> userIds,@Param("locDeptCode") String locDeptCode);
List<AuthAdmin> selectAllocatedList(FilterAuthUserRequest filterAuthUserRequest);

@ -14,6 +14,7 @@ public class FilterInvLinkDataRequest extends ListPageRequest {
private String userName;
private String employeeName;
private Long listUser[];
private String parentId;
}

@ -10,4 +10,5 @@ public class FilterNoSelectUserRequest extends ListPageRequest {
List<Long> userIds;
private String locDeptCode;
}

@ -140,7 +140,7 @@ public class AuthAdminServiceImpl implements AuthAdminService {
int offset = (filterNoSelectUserRequest.getPage() - 1) * filterNoSelectUserRequest.getLimit();
PageHelper.offsetPage(offset, filterNoSelectUserRequest.getLimit());
}
return authAdminDao.selectNotSelectUser(filterNoSelectUserRequest.getUserIds());
return authAdminDao.selectNotSelectUser(filterNoSelectUserRequest.getUserIds(),filterNoSelectUserRequest.getLocDeptCode());
}

@ -181,7 +181,9 @@
from auth_user
<where>
userFlag != 0
<if test="locDeptCode != null and '' != locDeptCode">
AND locDeptCode = #{locDeptCode}
</if>
<if test="userIds != null and userIds.size() != 0">
and id not in

Loading…
Cancel
Save